diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 9710f40..af3374d 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,5 +1,5 @@
 name: CI
-on: [push, pull_request, workflow_dispatch]
+on: [pull_request, workflow_dispatch]
 jobs:
   test:
     name: ${{ matrix.group }} Tests - Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -9,8 +9,6 @@ jobs:
       matrix:
         group:
           - Base
-          - Util
-          - Model
           - Ext
           - Doc
         version:
@@ -19,8 +17,8 @@ jobs:
           - 'nightly'
         os:
           - ubuntu-latest
-          - windows-latest
-          - macOS-latest
+#          - windows-latest
+#          - macOS-latest
         arch:
           - x64
     steps:
diff --git a/test/runtests.jl b/test/runtests.jl
index 240b14b..e6bee8c 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -4,7 +4,7 @@ using DelimitedFiles: readdlm
 const GROUP = get(ENV,"GROUP","All")
 const VERSION = get(ENV,"VERSION","latest")
 
-if GROUP == "All" || GROUP == "Base"
+if GROUP ∈ ["All", "Base"]
     @testset "GasDispersion.jl tests" begin
         @test_throws MethodError scenario_builder()
 
@@ -17,15 +17,11 @@ if GROUP == "All" || GROUP == "Base"
 
     # testing plot recipes
     include("base/recipe_tests.jl")
-end
 
-if GROUP == "All" || GROUP == "Util"
     # testing utilities
     include("utils/util_tests.jl")
     include("depreciation/depreciation_tests.jl")
-end
 
-if GROUP == "All" || GROUP == "Model"
     # testing source models
     include("source_models/jet_source_tests.jl")
 
@@ -51,6 +47,6 @@ end
 
 # some doc tests don't work with julia 1.3, because of Documenter
 # but I still want to run them in the tests sometimes
-if GROUP == "Doc" && VERSION != "1.3"
+if GROUP ∈ ["All", "Doc"] && VERSION != "1.3"
     doctest(GasDispersion, fix=false)
 end
\ No newline at end of file