diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index eaba9a57489..d84366439d9 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -86,6 +86,11 @@ jobs:
         with:
           cache-name: julia-cache;workflow=${{ github.workflow }};julia=${{ matrix.julia-version }};arch=${{ runner.arch }}
           include-matrix: false
+      - name: "HACK: Use GAP.jl master"
+        run: julia --project=. -e 'using Pkg; Pkg.add([
+                PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
+                PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
+              ])'
       - name: "Build package"
         uses: julia-actions/julia-buildpkg@v1
       - name: "limit OpenMP threads"
@@ -157,6 +162,11 @@ jobs:
         with:
           cache-name: julia-cache;workflow=${{ github.workflow }};julia=${{ matrix.julia-version }};arch=${{ runner.arch }}
           include-matrix: false
+      - name: "HACK: Use GAP.jl master"
+        run: julia --project=. -e 'using Pkg; Pkg.add([
+                PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
+                PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
+              ])'
       - name: "Build package"
         uses: julia-actions/julia-buildpkg@v1
       - name: "limit OpenMP threads"
@@ -167,6 +177,10 @@ jobs:
         run: |
           julia --project=docs --color=yes -e '
             using Pkg
+            Pkg.add([
+              PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
+              PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
+            ])
             Pkg.develop(PackageSpec(path=pwd()))
             Pkg.instantiate()'
       - name: "Run doctests"
diff --git a/.github/workflows/NoExperimental.yml b/.github/workflows/NoExperimental.yml
index 003f6ed586d..a75ac4173f6 100644
--- a/.github/workflows/NoExperimental.yml
+++ b/.github/workflows/NoExperimental.yml
@@ -44,6 +44,11 @@ jobs:
           include-matrix: false
       - name: "Symlink NoExperimental_whitelist.jl"
         run: ln -s NoExperimental_whitelist_.jl experimental/NoExperimental_whitelist.jl
+      - name: "HACK: Use GAP.jl master"
+        run: julia --project=. -e 'using Pkg; Pkg.add([
+                PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
+                PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
+              ])'
       - name: "Set test subgroup"
         if: ${{ matrix.group }} != ''
         run: echo "OSCAR_TEST_SUBSET=${{matrix.group}}" >> $GITHUB_ENV
@@ -68,12 +73,21 @@ jobs:
           include-matrix: false
       - name: "Symlink NoExperimental_whitelist.jl"
         run: ln -s NoExperimental_whitelist_.jl experimental/NoExperimental_whitelist.jl
+      - name: "HACK: Use GAP.jl master"
+        run: julia --project=. -e 'using Pkg; Pkg.add([
+                PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
+                PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
+              ])'
       - name: "Build package"
         uses: julia-actions/julia-buildpkg@v1
       - name: "Setup package"
         run: |
           julia --project=docs --color=yes -e '
             using Pkg
+            Pkg.add([
+              PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
+              PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
+            ])
             Pkg.develop(PackageSpec(path=pwd()))
             Pkg.instantiate()'
       - name: "Run doctests"
@@ -95,6 +109,11 @@ jobs:
           version: '1.10'
       - name: "Symlink NoExperimental_whitelist.jl"
         run: ln -s NoExperimental_whitelist_.jl experimental/NoExperimental_whitelist.jl
+      - name: "HACK: Use GAP.jl master"
+        run: julia --project=. -e 'using Pkg; Pkg.add([
+                PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
+                PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
+              ])'
       - name: Build package
         uses: julia-actions/julia-buildpkg@v1
       - name: Install dependencies
diff --git a/test/Aqua.jl b/test/Aqua.jl
index 07ef76bcb5b..af988791762 100644
--- a/test/Aqua.jl
+++ b/test/Aqua.jl
@@ -8,7 +8,7 @@ using Aqua
     piracies=false,         # TODO: check the reported methods to be moved upstream
     # Aqua persistent task does not work properly with developed dependencies
     # thus we disable these tests when running in OscarCI:
-    persistent_tasks=!haskey(ENV, "oscar_run_tests"),
+    persistent_tasks=false,
   )
   @test length(Aqua.detect_unbound_args_recursively(Oscar)) <= 16
 end