diff --git a/.github/workflows/go-tests-other-os.yml b/.github/workflows/go-tests-other-os.yml
deleted file mode 100644
index c06135ab82b9..000000000000
--- a/.github/workflows/go-tests-other-os.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: "Go: Run Tests - Other OS"
-on:
-  pull_request:
-    paths:
-      - "go/**"
-      - "!go/documentation/**"
-      - "!go/ql/**" # don't run other-os if only ql/ files changed
-      - .github/workflows/go-tests-other-os.yml
-      - .github/actions/**
-      - codeql-workspace.yml
-      - MODULE.bazel
-      - .bazelrc
-      - misc/bazel/**
-
-permissions:
-  contents: read
-
-jobs:
-  test-mac:
-    name: Test MacOS
-    runs-on: macos-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Run tests
-        uses: ./go/actions/test
-
-  test-win:
-    name: Test Windows
-    runs-on: windows-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Run tests
-        uses: ./go/actions/test
diff --git a/.github/workflows/go-tests-rtjo.yml b/.github/workflows/go-tests-rtjo.yml
deleted file mode 100644
index 43721fa1011a..000000000000
--- a/.github/workflows/go-tests-rtjo.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: "Go: Run RTJO Tests"
-on:
-  pull_request:
-    types:
-      - labeled
-
-permissions:
-  contents: read
-
-jobs:
-  test-linux:
-    if: "github.repository_owner == 'github' && github.event.label.name == 'Run: RTJO Language Tests'"
-    name: RTJO Test Linux (Ubuntu)
-    runs-on: ubuntu-latest-xl
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Run tests
-        uses: ./go/actions/test
-        with:
-          run-code-checks: true
-          dynamic-join-order-mode: all
diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml
index 994aba441826..c30abdd9e5d7 100644
--- a/.github/workflows/go-tests.yml
+++ b/.github/workflows/go-tests.yml
@@ -1,20 +1,9 @@
 name: "Go: Run Tests"
 on:
-  push:
-    paths:
-      - "go/**"
-      - "!go/documentation/**"
-      - "shared/**"
-      - .github/workflows/go-tests.yml
-      - .github/actions/**
-      - codeql-workspace.yml
-    branches:
-      - main
-      - "rc/*"
   pull_request:
     paths:
       - "go/**"
-      - "!go/documentation/**"      
+      - "!go/documentation/**"
       - "shared/**"
       - .github/workflows/go-tests.yml
       - .github/actions/**
diff --git a/go/actions/test/action.yml b/go/actions/test/action.yml
index 667ee4751ba9..f777535fec17 100644
--- a/go/actions/test/action.yml
+++ b/go/actions/test/action.yml
@@ -9,10 +9,6 @@ inputs:
     description: Whether to run formatting, code and qhelp generation checks
     required: false
     default: false
-  dynamic-join-order-mode:
-    description: Value of the --dynamic-join-order-mode flag to pass to the codeql test command
-    required: false
-    default: "none"
 runs:
   using: composite
   steps:
@@ -67,15 +63,3 @@ runs:
       with:
         name: qhelp-markdown
         path: go/qhelp-out/**/*.md
-
-    - name: Cache compilation cache
-      id: query-cache
-      uses: ./.github/actions/cache-query-compilation
-      with:
-        key: go-qltest
-
-    - name: Test
-      shell: bash
-      run: |
-        cd go
-        make test cache="${{ steps.query-cache.outputs.cache-dir }}" rtjo=${{ inputs.dynamic-join-order-mode }}