diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/build_environment.expected b/go/ql/integration-tests/bazel-sample-1/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-1/build_environment.expected
rename to go/ql/integration-tests/bazel-sample-1/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/diagnostics.expected b/go/ql/integration-tests/bazel-sample-1/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-1/diagnostics.expected
rename to go/ql/integration-tests/bazel-sample-1/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/BUILD.bazel b/go/ql/integration-tests/bazel-sample-1/src/BUILD.bazel
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/BUILD.bazel
rename to go/ql/integration-tests/bazel-sample-1/src/BUILD.bazel
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/go.mod b/go/ql/integration-tests/bazel-sample-1/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/go.mod
rename to go/ql/integration-tests/bazel-sample-1/src/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/go.sum b/go/ql/integration-tests/bazel-sample-1/src/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/go.sum
rename to go/ql/integration-tests/bazel-sample-1/src/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/test.go b/go/ql/integration-tests/bazel-sample-1/src/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/test.go
rename to go/ql/integration-tests/bazel-sample-1/src/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/todel.go b/go/ql/integration-tests/bazel-sample-1/src/todel.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/todel.go
rename to go/ql/integration-tests/bazel-sample-1/src/todel.go
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/test.expected b/go/ql/integration-tests/bazel-sample-1/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-1/test.expected
rename to go/ql/integration-tests/bazel-sample-1/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/test.py b/go/ql/integration-tests/bazel-sample-1/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-1/test.py
rename to go/ql/integration-tests/bazel-sample-1/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/test.ql b/go/ql/integration-tests/bazel-sample-1/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-1/test.ql
rename to go/ql/integration-tests/bazel-sample-1/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/build_environment.expected b/go/ql/integration-tests/bazel-sample-2/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-2/build_environment.expected
rename to go/ql/integration-tests/bazel-sample-2/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/diagnostics.expected b/go/ql/integration-tests/bazel-sample-2/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-2/diagnostics.expected
rename to go/ql/integration-tests/bazel-sample-2/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/BUILD b/go/ql/integration-tests/bazel-sample-2/src/BUILD
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/BUILD
rename to go/ql/integration-tests/bazel-sample-2/src/BUILD
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/go.mod b/go/ql/integration-tests/bazel-sample-2/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/go.mod
rename to go/ql/integration-tests/bazel-sample-2/src/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/go.sum b/go/ql/integration-tests/bazel-sample-2/src/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/go.sum
rename to go/ql/integration-tests/bazel-sample-2/src/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/test.go b/go/ql/integration-tests/bazel-sample-2/src/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/test.go
rename to go/ql/integration-tests/bazel-sample-2/src/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/todel.go b/go/ql/integration-tests/bazel-sample-2/src/todel.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/todel.go
rename to go/ql/integration-tests/bazel-sample-2/src/todel.go
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/test.expected b/go/ql/integration-tests/bazel-sample-2/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-2/test.expected
rename to go/ql/integration-tests/bazel-sample-2/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/test.py b/go/ql/integration-tests/bazel-sample-2/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-2/test.py
rename to go/ql/integration-tests/bazel-sample-2/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/test.ql b/go/ql/integration-tests/bazel-sample-2/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-2/test.ql
rename to go/ql/integration-tests/bazel-sample-2/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/configure-baseline/src/a/vendor/avendor.go b/go/ql/integration-tests/configure-baseline/src/a/vendor/avendor.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/configure-baseline/src/a/vendor/avendor.go
rename to go/ql/integration-tests/configure-baseline/src/a/vendor/avendor.go
diff --git a/go/ql/integration-tests/all-platforms/go/configure-baseline/src/a/vendor/modules.txt b/go/ql/integration-tests/configure-baseline/src/a/vendor/modules.txt
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/configure-baseline/src/a/vendor/modules.txt
rename to go/ql/integration-tests/configure-baseline/src/a/vendor/modules.txt
diff --git a/go/ql/integration-tests/all-platforms/go/configure-baseline/src/b/vendor/bvendor.go b/go/ql/integration-tests/configure-baseline/src/b/vendor/bvendor.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/configure-baseline/src/b/vendor/bvendor.go
rename to go/ql/integration-tests/configure-baseline/src/b/vendor/bvendor.go
diff --git a/go/ql/integration-tests/all-platforms/go/configure-baseline/src/b/vendor/modules.txt b/go/ql/integration-tests/configure-baseline/src/b/vendor/modules.txt
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/configure-baseline/src/b/vendor/modules.txt
rename to go/ql/integration-tests/configure-baseline/src/b/vendor/modules.txt
diff --git a/go/ql/integration-tests/all-platforms/go/configure-baseline/src/c/vendor/cvendor.go b/go/ql/integration-tests/configure-baseline/src/c/vendor/cvendor.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/configure-baseline/src/c/vendor/cvendor.go
rename to go/ql/integration-tests/configure-baseline/src/c/vendor/cvendor.go
diff --git a/go/ql/integration-tests/all-platforms/go/configure-baseline/src/root.go b/go/ql/integration-tests/configure-baseline/src/root.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/configure-baseline/src/root.go
rename to go/ql/integration-tests/configure-baseline/src/root.go
diff --git a/go/ql/integration-tests/all-platforms/go/configure-baseline/test.py b/go/ql/integration-tests/configure-baseline/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/configure-baseline/test.py
rename to go/ql/integration-tests/configure-baseline/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/build_environment.expected b/go/ql/integration-tests/dep-sample/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/build_environment.expected
rename to go/ql/integration-tests/dep-sample/build_environment.expected
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/diagnostics.expected b/go/ql/integration-tests/dep-sample/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/diagnostics.expected
rename to go/ql/integration-tests/dep-sample/diagnostics.expected
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/test.expected b/go/ql/integration-tests/dep-sample/test.expected
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/test.expected
rename to go/ql/integration-tests/dep-sample/test.expected
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/test.py b/go/ql/integration-tests/dep-sample/test.py
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/test.py
rename to go/ql/integration-tests/dep-sample/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/test.ql b/go/ql/integration-tests/dep-sample/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/test.ql
rename to go/ql/integration-tests/dep-sample/test.ql
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/work/Gopkg.lock b/go/ql/integration-tests/dep-sample/work/Gopkg.lock
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/work/Gopkg.lock
rename to go/ql/integration-tests/dep-sample/work/Gopkg.lock
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/work/Gopkg.toml b/go/ql/integration-tests/dep-sample/work/Gopkg.toml
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/work/Gopkg.toml
rename to go/ql/integration-tests/dep-sample/work/Gopkg.toml
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/work/test.go b/go/ql/integration-tests/dep-sample/work/test.go
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/work/test.go
rename to go/ql/integration-tests/dep-sample/work/test.go
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/work/vendor/golang.org/x/time/AUTHORS b/go/ql/integration-tests/dep-sample/work/vendor/golang.org/x/time/AUTHORS
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/work/vendor/golang.org/x/time/AUTHORS
rename to go/ql/integration-tests/dep-sample/work/vendor/golang.org/x/time/AUTHORS
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/work/vendor/golang.org/x/time/CONTRIBUTORS b/go/ql/integration-tests/dep-sample/work/vendor/golang.org/x/time/CONTRIBUTORS
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/work/vendor/golang.org/x/time/CONTRIBUTORS
rename to go/ql/integration-tests/dep-sample/work/vendor/golang.org/x/time/CONTRIBUTORS
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/work/vendor/golang.org/x/time/LICENSE b/go/ql/integration-tests/dep-sample/work/vendor/golang.org/x/time/LICENSE
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/work/vendor/golang.org/x/time/LICENSE
rename to go/ql/integration-tests/dep-sample/work/vendor/golang.org/x/time/LICENSE
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/work/vendor/golang.org/x/time/PATENTS b/go/ql/integration-tests/dep-sample/work/vendor/golang.org/x/time/PATENTS
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/work/vendor/golang.org/x/time/PATENTS
rename to go/ql/integration-tests/dep-sample/work/vendor/golang.org/x/time/PATENTS
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/work/vendor/golang.org/x/time/rate/rate.go b/go/ql/integration-tests/dep-sample/work/vendor/golang.org/x/time/rate/rate.go
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/work/vendor/golang.org/x/time/rate/rate.go
rename to go/ql/integration-tests/dep-sample/work/vendor/golang.org/x/time/rate/rate.go
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/build_environment.expected b/go/ql/integration-tests/diagnostics/build-constraints-exclude-all-go-files/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/build_environment.expected
rename to go/ql/integration-tests/diagnostics/build-constraints-exclude-all-go-files/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/diagnostics.expected b/go/ql/integration-tests/diagnostics/build-constraints-exclude-all-go-files/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/diagnostics.expected
rename to go/ql/integration-tests/diagnostics/build-constraints-exclude-all-go-files/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/test.py b/go/ql/integration-tests/diagnostics/build-constraints-exclude-all-go-files/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/test.py
rename to go/ql/integration-tests/diagnostics/build-constraints-exclude-all-go-files/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/work/go.mod b/go/ql/integration-tests/diagnostics/build-constraints-exclude-all-go-files/work/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/work/go.mod
rename to go/ql/integration-tests/diagnostics/build-constraints-exclude-all-go-files/work/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/work/go.sum b/go/ql/integration-tests/diagnostics/build-constraints-exclude-all-go-files/work/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/work/go.sum
rename to go/ql/integration-tests/diagnostics/build-constraints-exclude-all-go-files/work/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/work/test.go b/go/ql/integration-tests/diagnostics/build-constraints-exclude-all-go-files/work/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/work/test.go
rename to go/ql/integration-tests/diagnostics/build-constraints-exclude-all-go-files/work/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/build_environment.expected b/go/ql/integration-tests/diagnostics/go-files-found-not-processed/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/build_environment.expected
rename to go/ql/integration-tests/diagnostics/go-files-found-not-processed/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/diagnostics.expected b/go/ql/integration-tests/diagnostics/go-files-found-not-processed/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/diagnostics.expected
rename to go/ql/integration-tests/diagnostics/go-files-found-not-processed/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/test.expected b/go/ql/integration-tests/diagnostics/go-files-found-not-processed/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/test.expected
rename to go/ql/integration-tests/diagnostics/go-files-found-not-processed/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/test.py b/go/ql/integration-tests/diagnostics/go-files-found-not-processed/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/test.py
rename to go/ql/integration-tests/diagnostics/go-files-found-not-processed/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/test.ql b/go/ql/integration-tests/diagnostics/go-files-found-not-processed/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/test.ql
rename to go/ql/integration-tests/diagnostics/go-files-found-not-processed/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/work/go.mod b/go/ql/integration-tests/diagnostics/go-files-found-not-processed/work/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/work/go.mod
rename to go/ql/integration-tests/diagnostics/go-files-found-not-processed/work/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/work/go.sum b/go/ql/integration-tests/diagnostics/go-files-found-not-processed/work/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/work/go.sum
rename to go/ql/integration-tests/diagnostics/go-files-found-not-processed/work/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/work/subdir/go.mod b/go/ql/integration-tests/diagnostics/go-files-found-not-processed/work/subdir/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/work/subdir/go.mod
rename to go/ql/integration-tests/diagnostics/go-files-found-not-processed/work/subdir/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/work/subdir/go.sum b/go/ql/integration-tests/diagnostics/go-files-found-not-processed/work/subdir/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/work/subdir/go.sum
rename to go/ql/integration-tests/diagnostics/go-files-found-not-processed/work/subdir/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/work/subdir/test.go b/go/ql/integration-tests/diagnostics/go-files-found-not-processed/work/subdir/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/work/subdir/test.go
rename to go/ql/integration-tests/diagnostics/go-files-found-not-processed/work/subdir/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/build_environment.expected b/go/ql/integration-tests/diagnostics/invalid-toolchain-version/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/build_environment.expected
rename to go/ql/integration-tests/diagnostics/invalid-toolchain-version/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/diagnostics.expected b/go/ql/integration-tests/diagnostics/invalid-toolchain-version/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/diagnostics.expected
rename to go/ql/integration-tests/diagnostics/invalid-toolchain-version/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/src/go.mod b/go/ql/integration-tests/diagnostics/invalid-toolchain-version/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/src/go.mod
rename to go/ql/integration-tests/diagnostics/invalid-toolchain-version/src/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/src/main.go b/go/ql/integration-tests/diagnostics/invalid-toolchain-version/src/main.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/src/main.go
rename to go/ql/integration-tests/diagnostics/invalid-toolchain-version/src/main.go
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/test.py b/go/ql/integration-tests/diagnostics/invalid-toolchain-version/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/test.py
rename to go/ql/integration-tests/diagnostics/invalid-toolchain-version/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/build_environment.expected b/go/ql/integration-tests/diagnostics/newer-go-version-needed/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/build_environment.expected
rename to go/ql/integration-tests/diagnostics/newer-go-version-needed/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/diagnostics.expected b/go/ql/integration-tests/diagnostics/newer-go-version-needed/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/diagnostics.expected
rename to go/ql/integration-tests/diagnostics/newer-go-version-needed/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/test.py b/go/ql/integration-tests/diagnostics/newer-go-version-needed/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/test.py
rename to go/ql/integration-tests/diagnostics/newer-go-version-needed/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/work/go.mod b/go/ql/integration-tests/diagnostics/newer-go-version-needed/work/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/work/go.mod
rename to go/ql/integration-tests/diagnostics/newer-go-version-needed/work/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/work/go.sum b/go/ql/integration-tests/diagnostics/newer-go-version-needed/work/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/work/go.sum
rename to go/ql/integration-tests/diagnostics/newer-go-version-needed/work/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/work/test.go b/go/ql/integration-tests/diagnostics/newer-go-version-needed/work/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/work/test.go
rename to go/ql/integration-tests/diagnostics/newer-go-version-needed/work/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/build_environment.expected b/go/ql/integration-tests/diagnostics/no-go-files-found/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/build_environment.expected
rename to go/ql/integration-tests/diagnostics/no-go-files-found/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/diagnostics.expected b/go/ql/integration-tests/diagnostics/no-go-files-found/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/diagnostics.expected
rename to go/ql/integration-tests/diagnostics/no-go-files-found/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/test.py b/go/ql/integration-tests/diagnostics/no-go-files-found/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/test.py
rename to go/ql/integration-tests/diagnostics/no-go-files-found/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/work/test.txt b/go/ql/integration-tests/diagnostics/no-go-files-found/work/test.txt
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/work/test.txt
rename to go/ql/integration-tests/diagnostics/no-go-files-found/work/test.txt
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/build_environment.expected b/go/ql/integration-tests/diagnostics/package-not-found-with-go-mod/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/build_environment.expected
rename to go/ql/integration-tests/diagnostics/package-not-found-with-go-mod/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/diagnostics.expected b/go/ql/integration-tests/diagnostics/package-not-found-with-go-mod/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/diagnostics.expected
rename to go/ql/integration-tests/diagnostics/package-not-found-with-go-mod/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/test.py b/go/ql/integration-tests/diagnostics/package-not-found-with-go-mod/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/test.py
rename to go/ql/integration-tests/diagnostics/package-not-found-with-go-mod/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/work/go.mod b/go/ql/integration-tests/diagnostics/package-not-found-with-go-mod/work/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/work/go.mod
rename to go/ql/integration-tests/diagnostics/package-not-found-with-go-mod/work/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/work/go.sum b/go/ql/integration-tests/diagnostics/package-not-found-with-go-mod/work/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/work/go.sum
rename to go/ql/integration-tests/diagnostics/package-not-found-with-go-mod/work/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/work/test.go b/go/ql/integration-tests/diagnostics/package-not-found-with-go-mod/work/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/work/test.go
rename to go/ql/integration-tests/diagnostics/package-not-found-with-go-mod/work/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/build_environment.expected b/go/ql/integration-tests/diagnostics/package-not-found-without-go-mod/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/build_environment.expected
rename to go/ql/integration-tests/diagnostics/package-not-found-without-go-mod/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/diagnostics.expected b/go/ql/integration-tests/diagnostics/package-not-found-without-go-mod/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/diagnostics.expected
rename to go/ql/integration-tests/diagnostics/package-not-found-without-go-mod/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/test.py b/go/ql/integration-tests/diagnostics/package-not-found-without-go-mod/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/test.py
rename to go/ql/integration-tests/diagnostics/package-not-found-without-go-mod/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/work/test.go b/go/ql/integration-tests/diagnostics/package-not-found-without-go-mod/work/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/work/test.go
rename to go/ql/integration-tests/diagnostics/package-not-found-without-go-mod/work/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/build_environment.expected b/go/ql/integration-tests/diagnostics/unsupported-relative-path/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/extract-vendor/build_environment.expected
rename to go/ql/integration-tests/diagnostics/unsupported-relative-path/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/diagnostics.expected b/go/ql/integration-tests/diagnostics/unsupported-relative-path/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/diagnostics.expected
rename to go/ql/integration-tests/diagnostics/unsupported-relative-path/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/test.py b/go/ql/integration-tests/diagnostics/unsupported-relative-path/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/test.py
rename to go/ql/integration-tests/diagnostics/unsupported-relative-path/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/work/main/main.go b/go/ql/integration-tests/diagnostics/unsupported-relative-path/work/main/main.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/work/main/main.go
rename to go/ql/integration-tests/diagnostics/unsupported-relative-path/work/main/main.go
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/work/main/subpkg/subpkg.go b/go/ql/integration-tests/diagnostics/unsupported-relative-path/work/main/subpkg/subpkg.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/work/main/subpkg/subpkg.go
rename to go/ql/integration-tests/diagnostics/unsupported-relative-path/work/main/subpkg/subpkg.go
diff --git a/go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/build_environment.expected b/go/ql/integration-tests/extract-vendor/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/build_environment.expected
rename to go/ql/integration-tests/extract-vendor/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/diagnostics.expected b/go/ql/integration-tests/extract-vendor/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/extract-vendor/diagnostics.expected
rename to go/ql/integration-tests/extract-vendor/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/src/go.mod b/go/ql/integration-tests/extract-vendor/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/extract-vendor/src/go.mod
rename to go/ql/integration-tests/extract-vendor/src/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/src/go.sum b/go/ql/integration-tests/extract-vendor/src/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/extract-vendor/src/go.sum
rename to go/ql/integration-tests/extract-vendor/src/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/src/test.go b/go/ql/integration-tests/extract-vendor/src/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/extract-vendor/src/test.go
rename to go/ql/integration-tests/extract-vendor/src/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/src/vendor/example.com/test/add.go b/go/ql/integration-tests/extract-vendor/src/vendor/example.com/test/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/extract-vendor/src/vendor/example.com/test/add.go
rename to go/ql/integration-tests/extract-vendor/src/vendor/example.com/test/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/src/vendor/modules.txt b/go/ql/integration-tests/extract-vendor/src/vendor/modules.txt
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/extract-vendor/src/vendor/modules.txt
rename to go/ql/integration-tests/extract-vendor/src/vendor/modules.txt
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/test.expected b/go/ql/integration-tests/extract-vendor/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/extract-vendor/test.expected
rename to go/ql/integration-tests/extract-vendor/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/test.py b/go/ql/integration-tests/extract-vendor/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/extract-vendor/test.py
rename to go/ql/integration-tests/extract-vendor/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/test.ql b/go/ql/integration-tests/extract-vendor/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/extract-vendor/test.ql
rename to go/ql/integration-tests/extract-vendor/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-sample/build_environment.expected b/go/ql/integration-tests/glide-sample/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-sample/build_environment.expected
rename to go/ql/integration-tests/glide-sample/build_environment.expected
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/diagnostics.expected b/go/ql/integration-tests/glide-sample/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/diagnostics.expected
rename to go/ql/integration-tests/glide-sample/diagnostics.expected
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/force_sequential_test_execution b/go/ql/integration-tests/glide-sample/force_sequential_test_execution
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/force_sequential_test_execution
rename to go/ql/integration-tests/glide-sample/force_sequential_test_execution
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/test.expected b/go/ql/integration-tests/glide-sample/test.expected
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/test.expected
rename to go/ql/integration-tests/glide-sample/test.expected
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/test.py b/go/ql/integration-tests/glide-sample/test.py
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/test.py
rename to go/ql/integration-tests/glide-sample/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-sample/test.ql b/go/ql/integration-tests/glide-sample/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-sample/test.ql
rename to go/ql/integration-tests/glide-sample/test.ql
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/work/glide.lock b/go/ql/integration-tests/glide-sample/work/glide.lock
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/work/glide.lock
rename to go/ql/integration-tests/glide-sample/work/glide.lock
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/work/glide.yaml b/go/ql/integration-tests/glide-sample/work/glide.yaml
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/work/glide.yaml
rename to go/ql/integration-tests/glide-sample/work/glide.yaml
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/work/test.go b/go/ql/integration-tests/glide-sample/work/test.go
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/work/test.go
rename to go/ql/integration-tests/glide-sample/work/test.go
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/AUTHORS b/go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/AUTHORS
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/AUTHORS
rename to go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/AUTHORS
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/CONTRIBUTING.md b/go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/CONTRIBUTING.md
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/CONTRIBUTING.md
rename to go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/CONTRIBUTING.md
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/CONTRIBUTORS b/go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/CONTRIBUTORS
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/CONTRIBUTORS
rename to go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/CONTRIBUTORS
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/LICENSE b/go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/LICENSE
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/LICENSE
rename to go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/LICENSE
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/PATENTS b/go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/PATENTS
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/PATENTS
rename to go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/PATENTS
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/README.md b/go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/README.md
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/README.md
rename to go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/README.md
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/go.mod b/go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/go.mod
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/go.mod
rename to go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/go.mod
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/rate/rate.go b/go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/rate/rate.go
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/rate/rate.go
rename to go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/rate/rate.go
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/rate/rate_test.go b/go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/rate/rate_test.go
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/work/vendor/golang.org/x/time/rate/rate_test.go
rename to go/ql/integration-tests/glide-sample/work/vendor/golang.org/x/time/rate/rate_test.go
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-without-version/build_environment.expected b/go/ql/integration-tests/go-get-without-modules-sample/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-without-version/build_environment.expected
rename to go/ql/integration-tests/go-get-without-modules-sample/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/src/test.go b/go/ql/integration-tests/go-get-without-modules-sample/src/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/src/test.go
rename to go/ql/integration-tests/go-get-without-modules-sample/src/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/test.expected b/go/ql/integration-tests/go-get-without-modules-sample/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/test.expected
rename to go/ql/integration-tests/go-get-without-modules-sample/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/test.py b/go/ql/integration-tests/go-get-without-modules-sample/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/test.py
rename to go/ql/integration-tests/go-get-without-modules-sample/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/test.ql b/go/ql/integration-tests/go-get-without-modules-sample/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/make-sample/test.ql
rename to go/ql/integration-tests/go-get-without-modules-sample/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/go-version-bump/build_environment.expected b/go/ql/integration-tests/go-mod-sample/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-version-bump/build_environment.expected
rename to go/ql/integration-tests/go-mod-sample/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-sample/diagnostics.expected b/go/ql/integration-tests/go-mod-sample/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-sample/diagnostics.expected
rename to go/ql/integration-tests/go-mod-sample/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-sample/src/Makefile b/go/ql/integration-tests/go-mod-sample/src/Makefile
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-sample/src/Makefile
rename to go/ql/integration-tests/go-mod-sample/src/Makefile
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-sample/src/go.mod b/go/ql/integration-tests/go-mod-sample/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-sample/src/go.mod
rename to go/ql/integration-tests/go-mod-sample/src/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-sample/src/go.sum b/go/ql/integration-tests/go-mod-sample/src/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-sample/src/go.sum
rename to go/ql/integration-tests/go-mod-sample/src/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-sample/src/test.go b/go/ql/integration-tests/go-mod-sample/src/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-sample/src/test.go
rename to go/ql/integration-tests/go-mod-sample/src/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-sample/test.expected b/go/ql/integration-tests/go-mod-sample/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-sample/test.expected
rename to go/ql/integration-tests/go-mod-sample/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-sample/test.py b/go/ql/integration-tests/go-mod-sample/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-sample/test.py
rename to go/ql/integration-tests/go-mod-sample/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/test.ql b/go/ql/integration-tests/go-mod-sample/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/ninja-sample/test.ql
rename to go/ql/integration-tests/go-mod-sample/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/build_environment.expected b/go/ql/integration-tests/go-mod-without-version/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/make-sample/build_environment.expected
rename to go/ql/integration-tests/go-mod-without-version/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-without-version/diagnostics.expected b/go/ql/integration-tests/go-mod-without-version/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-without-version/diagnostics.expected
rename to go/ql/integration-tests/go-mod-without-version/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-without-version/src/go.mod b/go/ql/integration-tests/go-mod-without-version/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-without-version/src/go.mod
rename to go/ql/integration-tests/go-mod-without-version/src/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-without-version/src/go.sum b/go/ql/integration-tests/go-mod-without-version/src/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-without-version/src/go.sum
rename to go/ql/integration-tests/go-mod-without-version/src/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-without-version/src/subdir/add.go b/go/ql/integration-tests/go-mod-without-version/src/subdir/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-without-version/src/subdir/add.go
rename to go/ql/integration-tests/go-mod-without-version/src/subdir/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-without-version/src/test.go b/go/ql/integration-tests/go-mod-without-version/src/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-without-version/src/test.go
rename to go/ql/integration-tests/go-mod-without-version/src/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-without-version/test.expected b/go/ql/integration-tests/go-mod-without-version/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-without-version/test.expected
rename to go/ql/integration-tests/go-mod-without-version/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-without-version/test.py b/go/ql/integration-tests/go-mod-without-version/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-without-version/test.py
rename to go/ql/integration-tests/go-mod-without-version/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-without-version/test.ql b/go/ql/integration-tests/go-mod-without-version/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-without-version/test.ql
rename to go/ql/integration-tests/go-mod-without-version/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/build_environment.expected b/go/ql/integration-tests/go-version-bump/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/build_environment.expected
rename to go/ql/integration-tests/go-version-bump/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-version-bump/diagnostics.expected b/go/ql/integration-tests/go-version-bump/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-version-bump/diagnostics.expected
rename to go/ql/integration-tests/go-version-bump/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-version-bump/src/go.mod b/go/ql/integration-tests/go-version-bump/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-version-bump/src/go.mod
rename to go/ql/integration-tests/go-version-bump/src/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/go-version-bump/src/main.go b/go/ql/integration-tests/go-version-bump/src/main.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-version-bump/src/main.go
rename to go/ql/integration-tests/go-version-bump/src/main.go
diff --git a/go/ql/integration-tests/all-platforms/go/go-version-bump/test.py b/go/ql/integration-tests/go-version-bump/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-version-bump/test.py
rename to go/ql/integration-tests/go-version-bump/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/build_environment.expected b/go/ql/integration-tests/make-sample/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/ninja-sample/build_environment.expected
rename to go/ql/integration-tests/make-sample/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/diagnostics.expected b/go/ql/integration-tests/make-sample/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/make-sample/diagnostics.expected
rename to go/ql/integration-tests/make-sample/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/src/Makefile b/go/ql/integration-tests/make-sample/src/Makefile
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/make-sample/src/Makefile
rename to go/ql/integration-tests/make-sample/src/Makefile
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/src/go.mod b/go/ql/integration-tests/make-sample/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/make-sample/src/go.mod
rename to go/ql/integration-tests/make-sample/src/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/src/go.sum b/go/ql/integration-tests/make-sample/src/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/make-sample/src/go.sum
rename to go/ql/integration-tests/make-sample/src/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/src/test.go b/go/ql/integration-tests/make-sample/src/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/make-sample/src/test.go
rename to go/ql/integration-tests/make-sample/src/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/src/todel.go b/go/ql/integration-tests/make-sample/src/todel.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/make-sample/src/todel.go
rename to go/ql/integration-tests/make-sample/src/todel.go
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/test.expected b/go/ql/integration-tests/make-sample/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/make-sample/test.expected
rename to go/ql/integration-tests/make-sample/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/test.py b/go/ql/integration-tests/make-sample/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/make-sample/test.py
rename to go/ql/integration-tests/make-sample/test.py
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/test.ql b/go/ql/integration-tests/make-sample/test.ql
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/test.ql
rename to go/ql/integration-tests/make-sample/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/build_environment.expected b/go/ql/integration-tests/mixed-layout/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/build_environment.expected
rename to go/ql/integration-tests/mixed-layout/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/diagnostics.expected b/go/ql/integration-tests/mixed-layout/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/diagnostics.expected
rename to go/ql/integration-tests/mixed-layout/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/src/module/go.mod b/go/ql/integration-tests/mixed-layout/src/module/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/src/module/go.mod
rename to go/ql/integration-tests/mixed-layout/src/module/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/src/module/go.sum b/go/ql/integration-tests/mixed-layout/src/module/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/src/module/go.sum
rename to go/ql/integration-tests/mixed-layout/src/module/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/src/module/test.go b/go/ql/integration-tests/mixed-layout/src/module/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/src/module/test.go
rename to go/ql/integration-tests/mixed-layout/src/module/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/src/stray-files/test.go b/go/ql/integration-tests/mixed-layout/src/stray-files/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/src/stray-files/test.go
rename to go/ql/integration-tests/mixed-layout/src/stray-files/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/src/workspace/go.work b/go/ql/integration-tests/mixed-layout/src/workspace/go.work
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/src/workspace/go.work
rename to go/ql/integration-tests/mixed-layout/src/workspace/go.work
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/src/workspace/subdir/go.mod b/go/ql/integration-tests/mixed-layout/src/workspace/subdir/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/src/workspace/subdir/go.mod
rename to go/ql/integration-tests/mixed-layout/src/workspace/subdir/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/src/workspace/subdir/go.sum b/go/ql/integration-tests/mixed-layout/src/workspace/subdir/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/src/workspace/subdir/go.sum
rename to go/ql/integration-tests/mixed-layout/src/workspace/subdir/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/src/workspace/subdir/test.go b/go/ql/integration-tests/mixed-layout/src/workspace/subdir/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/src/workspace/subdir/test.go
rename to go/ql/integration-tests/mixed-layout/src/workspace/subdir/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/test.expected b/go/ql/integration-tests/mixed-layout/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/test.expected
rename to go/ql/integration-tests/mixed-layout/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/test.py b/go/ql/integration-tests/mixed-layout/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/test.py
rename to go/ql/integration-tests/mixed-layout/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/test.ql b/go/ql/integration-tests/mixed-layout/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/test.ql
rename to go/ql/integration-tests/mixed-layout/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/build_environment.expected b/go/ql/integration-tests/ninja-sample/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/build_environment.expected
rename to go/ql/integration-tests/ninja-sample/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/diagnostics.expected b/go/ql/integration-tests/ninja-sample/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/ninja-sample/diagnostics.expected
rename to go/ql/integration-tests/ninja-sample/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/src/.ninja_log b/go/ql/integration-tests/ninja-sample/src/.ninja_log
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/ninja-sample/src/.ninja_log
rename to go/ql/integration-tests/ninja-sample/src/.ninja_log
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/src/build.ninja b/go/ql/integration-tests/ninja-sample/src/build.ninja
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/ninja-sample/src/build.ninja
rename to go/ql/integration-tests/ninja-sample/src/build.ninja
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/src/go.mod b/go/ql/integration-tests/ninja-sample/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/ninja-sample/src/go.mod
rename to go/ql/integration-tests/ninja-sample/src/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/src/go.sum b/go/ql/integration-tests/ninja-sample/src/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/ninja-sample/src/go.sum
rename to go/ql/integration-tests/ninja-sample/src/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/src/test.go b/go/ql/integration-tests/ninja-sample/src/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/ninja-sample/src/test.go
rename to go/ql/integration-tests/ninja-sample/src/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/src/todel.go b/go/ql/integration-tests/ninja-sample/src/todel.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/ninja-sample/src/todel.go
rename to go/ql/integration-tests/ninja-sample/src/todel.go
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/test.expected b/go/ql/integration-tests/ninja-sample/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/ninja-sample/test.expected
rename to go/ql/integration-tests/ninja-sample/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/test.py b/go/ql/integration-tests/ninja-sample/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/ninja-sample/test.py
rename to go/ql/integration-tests/ninja-sample/test.py
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/test.ql b/go/ql/integration-tests/ninja-sample/test.ql
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/test.ql
rename to go/ql/integration-tests/ninja-sample/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/build_environment.expected b/go/ql/integration-tests/resolve-build-environment/newer-go-needed/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/build_environment.expected
rename to go/ql/integration-tests/resolve-build-environment/newer-go-needed/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/diagnostics.expected b/go/ql/integration-tests/resolve-build-environment/newer-go-needed/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/diagnostics.expected
rename to go/ql/integration-tests/resolve-build-environment/newer-go-needed/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/src/go.mod b/go/ql/integration-tests/resolve-build-environment/newer-go-needed/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/src/go.mod
rename to go/ql/integration-tests/resolve-build-environment/newer-go-needed/src/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/src/main.go b/go/ql/integration-tests/resolve-build-environment/newer-go-needed/src/main.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/src/main.go
rename to go/ql/integration-tests/resolve-build-environment/newer-go-needed/src/main.go
diff --git a/go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/test.py b/go/ql/integration-tests/resolve-build-environment/newer-go-needed/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/test.py
rename to go/ql/integration-tests/resolve-build-environment/newer-go-needed/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/build_environment.expected b/go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/build_environment.expected
rename to go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/diagnostics.expected b/go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/diagnostics.expected
rename to go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/main.go b/go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/src/main.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/main.go
rename to go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/src/main.go
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/subdir/go.mod b/go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/src/subdir/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/subdir/go.mod
rename to go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/src/subdir/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/subdir/go.sum b/go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/src/subdir/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/subdir/go.sum
rename to go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/src/subdir/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/subdir/subsubdir/add.go b/go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/src/subdir/subsubdir/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/subdir/subsubdir/add.go
rename to go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/src/subdir/subsubdir/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/subdir/test.go b/go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/src/subdir/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/subdir/test.go
rename to go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/src/subdir/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/test.expected b/go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/test.expected
rename to go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/test.py b/go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/test.py
rename to go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/test.ql b/go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/test.ql
rename to go/ql/integration-tests/single-go-mod-and-go-files-not-under-it/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/build_environment.expected b/go/ql/integration-tests/single-go-mod-in-root/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/build_environment.expected
rename to go/ql/integration-tests/single-go-mod-in-root/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/diagnostics.expected b/go/ql/integration-tests/single-go-mod-in-root/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/diagnostics.expected
rename to go/ql/integration-tests/single-go-mod-in-root/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/src/go.mod b/go/ql/integration-tests/single-go-mod-in-root/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/src/go.mod
rename to go/ql/integration-tests/single-go-mod-in-root/src/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/src/go.sum b/go/ql/integration-tests/single-go-mod-in-root/src/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/src/go.sum
rename to go/ql/integration-tests/single-go-mod-in-root/src/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/src/subdir/add.go b/go/ql/integration-tests/single-go-mod-in-root/src/subdir/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/src/subdir/add.go
rename to go/ql/integration-tests/single-go-mod-in-root/src/subdir/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/src/test.go b/go/ql/integration-tests/single-go-mod-in-root/src/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/src/test.go
rename to go/ql/integration-tests/single-go-mod-in-root/src/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/test.expected b/go/ql/integration-tests/single-go-mod-in-root/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/test.expected
rename to go/ql/integration-tests/single-go-mod-in-root/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/test.py b/go/ql/integration-tests/single-go-mod-in-root/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/test.py
rename to go/ql/integration-tests/single-go-mod-in-root/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/test.ql b/go/ql/integration-tests/single-go-mod-in-root/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/test.ql
rename to go/ql/integration-tests/single-go-mod-in-root/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/build_environment.expected b/go/ql/integration-tests/single-go-mod-not-in-root/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/build_environment.expected
rename to go/ql/integration-tests/single-go-mod-not-in-root/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/diagnostics.expected b/go/ql/integration-tests/single-go-mod-not-in-root/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/diagnostics.expected
rename to go/ql/integration-tests/single-go-mod-not-in-root/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/src/subdir/go.mod b/go/ql/integration-tests/single-go-mod-not-in-root/src/subdir/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/src/subdir/go.mod
rename to go/ql/integration-tests/single-go-mod-not-in-root/src/subdir/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/src/subdir/go.sum b/go/ql/integration-tests/single-go-mod-not-in-root/src/subdir/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/src/subdir/go.sum
rename to go/ql/integration-tests/single-go-mod-not-in-root/src/subdir/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/src/subdir/subsubdir/add.go b/go/ql/integration-tests/single-go-mod-not-in-root/src/subdir/subsubdir/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/src/subdir/subsubdir/add.go
rename to go/ql/integration-tests/single-go-mod-not-in-root/src/subdir/subsubdir/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/src/subdir/test.go b/go/ql/integration-tests/single-go-mod-not-in-root/src/subdir/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/src/subdir/test.go
rename to go/ql/integration-tests/single-go-mod-not-in-root/src/subdir/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/test.expected b/go/ql/integration-tests/single-go-mod-not-in-root/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/test.expected
rename to go/ql/integration-tests/single-go-mod-not-in-root/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/test.py b/go/ql/integration-tests/single-go-mod-not-in-root/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/test.py
rename to go/ql/integration-tests/single-go-mod-not-in-root/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/test.ql b/go/ql/integration-tests/single-go-mod-not-in-root/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/test.ql
rename to go/ql/integration-tests/single-go-mod-not-in-root/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/build_environment.expected b/go/ql/integration-tests/single-go-work-not-in-root/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/build_environment.expected
rename to go/ql/integration-tests/single-go-work-not-in-root/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/diagnostics.expected b/go/ql/integration-tests/single-go-work-not-in-root/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/diagnostics.expected
rename to go/ql/integration-tests/single-go-work-not-in-root/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/go.work b/go/ql/integration-tests/single-go-work-not-in-root/src/modules/go.work
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/go.work
rename to go/ql/integration-tests/single-go-work-not-in-root/src/modules/go.work
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir1/go.mod b/go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir1/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir1/go.mod
rename to go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir1/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir1/go.sum b/go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir1/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir1/go.sum
rename to go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir1/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir1/subsubdir1/add.go b/go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir1/subsubdir1/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir1/subsubdir1/add.go
rename to go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir1/subsubdir1/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir1/test.go b/go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir1/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir1/test.go
rename to go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir1/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir2/go.mod b/go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir2/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir2/go.mod
rename to go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir2/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir2/go.sum b/go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir2/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir2/go.sum
rename to go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir2/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir2/subsubdir2/add.go b/go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir2/subsubdir2/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir2/subsubdir2/add.go
rename to go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir2/subsubdir2/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir2/test.go b/go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir2/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir2/test.go
rename to go/ql/integration-tests/single-go-work-not-in-root/src/modules/subdir2/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/test.expected b/go/ql/integration-tests/single-go-work-not-in-root/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/test.expected
rename to go/ql/integration-tests/single-go-work-not-in-root/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/test.py b/go/ql/integration-tests/single-go-work-not-in-root/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/test.py
rename to go/ql/integration-tests/single-go-work-not-in-root/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/test.ql b/go/ql/integration-tests/single-go-work-not-in-root/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/test.ql
rename to go/ql/integration-tests/single-go-work-not-in-root/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/build_environment.expected b/go/ql/integration-tests/two-go-mods-nested-none-in-root/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/build_environment.expected
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/diagnostics.expected b/go/ql/integration-tests/two-go-mods-nested-none-in-root/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/diagnostics.expected
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/go.mod b/go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/go.mod
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/go.sum b/go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/go.sum
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir1/go.mod b/go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/subdir1/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir1/go.mod
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/subdir1/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir1/go.sum b/go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/subdir1/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir1/go.sum
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/subdir1/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir1/subsubdir1/add.go b/go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/subdir1/subsubdir1/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir1/subsubdir1/add.go
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/subdir1/subsubdir1/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir1/test.go b/go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/subdir1/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir1/test.go
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/subdir1/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir2/add.go b/go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/subdir2/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir2/add.go
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/subdir2/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/test.go b/go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/test.go
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/src/subdir0/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/test.expected b/go/ql/integration-tests/two-go-mods-nested-none-in-root/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/test.expected
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/test.py b/go/ql/integration-tests/two-go-mods-nested-none-in-root/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/test.py
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/test.ql b/go/ql/integration-tests/two-go-mods-nested-none-in-root/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/test.ql
rename to go/ql/integration-tests/two-go-mods-nested-none-in-root/test.ql
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/build_environment.expected b/go/ql/integration-tests/two-go-mods-nested-one-in-root/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/build_environment.expected
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/diagnostics.expected b/go/ql/integration-tests/two-go-mods-nested-one-in-root/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/diagnostics.expected
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/go.mod b/go/ql/integration-tests/two-go-mods-nested-one-in-root/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/go.mod
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/src/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/go.sum b/go/ql/integration-tests/two-go-mods-nested-one-in-root/src/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/go.sum
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/src/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/subdir1/go.mod b/go/ql/integration-tests/two-go-mods-nested-one-in-root/src/subdir1/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/subdir1/go.mod
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/src/subdir1/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/subdir1/go.sum b/go/ql/integration-tests/two-go-mods-nested-one-in-root/src/subdir1/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/subdir1/go.sum
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/src/subdir1/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/subdir1/subsubdir1/add.go b/go/ql/integration-tests/two-go-mods-nested-one-in-root/src/subdir1/subsubdir1/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/subdir1/subsubdir1/add.go
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/src/subdir1/subsubdir1/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/subdir1/test.go b/go/ql/integration-tests/two-go-mods-nested-one-in-root/src/subdir1/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/subdir1/test.go
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/src/subdir1/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/subdir2/add.go b/go/ql/integration-tests/two-go-mods-nested-one-in-root/src/subdir2/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/subdir2/add.go
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/src/subdir2/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/test.go b/go/ql/integration-tests/two-go-mods-nested-one-in-root/src/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/src/test.go
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/src/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/test.expected b/go/ql/integration-tests/two-go-mods-nested-one-in-root/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/test.expected
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/test.py b/go/ql/integration-tests/two-go-mods-nested-one-in-root/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/test.py
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/test.ql b/go/ql/integration-tests/two-go-mods-nested-one-in-root/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/test.ql
rename to go/ql/integration-tests/two-go-mods-nested-one-in-root/test.ql
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/build_environment.expected b/go/ql/integration-tests/two-go-mods-not-nested/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/build_environment.expected
rename to go/ql/integration-tests/two-go-mods-not-nested/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/diagnostics.expected b/go/ql/integration-tests/two-go-mods-not-nested/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/diagnostics.expected
rename to go/ql/integration-tests/two-go-mods-not-nested/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir1/go.mod b/go/ql/integration-tests/two-go-mods-not-nested/src/subdir1/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir1/go.mod
rename to go/ql/integration-tests/two-go-mods-not-nested/src/subdir1/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir1/go.sum b/go/ql/integration-tests/two-go-mods-not-nested/src/subdir1/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir1/go.sum
rename to go/ql/integration-tests/two-go-mods-not-nested/src/subdir1/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir1/subsubdir1/add.go b/go/ql/integration-tests/two-go-mods-not-nested/src/subdir1/subsubdir1/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir1/subsubdir1/add.go
rename to go/ql/integration-tests/two-go-mods-not-nested/src/subdir1/subsubdir1/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir1/test.go b/go/ql/integration-tests/two-go-mods-not-nested/src/subdir1/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir1/test.go
rename to go/ql/integration-tests/two-go-mods-not-nested/src/subdir1/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir2/go.mod b/go/ql/integration-tests/two-go-mods-not-nested/src/subdir2/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir2/go.mod
rename to go/ql/integration-tests/two-go-mods-not-nested/src/subdir2/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir2/go.sum b/go/ql/integration-tests/two-go-mods-not-nested/src/subdir2/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir2/go.sum
rename to go/ql/integration-tests/two-go-mods-not-nested/src/subdir2/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir2/subsubdir2/add.go b/go/ql/integration-tests/two-go-mods-not-nested/src/subdir2/subsubdir2/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir2/subsubdir2/add.go
rename to go/ql/integration-tests/two-go-mods-not-nested/src/subdir2/subsubdir2/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir2/test.go b/go/ql/integration-tests/two-go-mods-not-nested/src/subdir2/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/src/subdir2/test.go
rename to go/ql/integration-tests/two-go-mods-not-nested/src/subdir2/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/test.expected b/go/ql/integration-tests/two-go-mods-not-nested/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/test.expected
rename to go/ql/integration-tests/two-go-mods-not-nested/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/test.py b/go/ql/integration-tests/two-go-mods-not-nested/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/test.py
rename to go/ql/integration-tests/two-go-mods-not-nested/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/test.ql b/go/ql/integration-tests/two-go-mods-not-nested/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/test.ql
rename to go/ql/integration-tests/two-go-mods-not-nested/test.ql
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/build_environment.expected b/go/ql/integration-tests/two-go-mods-one-failure/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/build_environment.expected
rename to go/ql/integration-tests/two-go-mods-one-failure/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/diagnostics.expected b/go/ql/integration-tests/two-go-mods-one-failure/diagnostics.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/diagnostics.expected
rename to go/ql/integration-tests/two-go-mods-one-failure/diagnostics.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir1/go.mod b/go/ql/integration-tests/two-go-mods-one-failure/src/subdir1/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir1/go.mod
rename to go/ql/integration-tests/two-go-mods-one-failure/src/subdir1/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir1/go.sum b/go/ql/integration-tests/two-go-mods-one-failure/src/subdir1/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir1/go.sum
rename to go/ql/integration-tests/two-go-mods-one-failure/src/subdir1/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir1/subsubdir1/add.go b/go/ql/integration-tests/two-go-mods-one-failure/src/subdir1/subsubdir1/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir1/subsubdir1/add.go
rename to go/ql/integration-tests/two-go-mods-one-failure/src/subdir1/subsubdir1/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir1/test.go b/go/ql/integration-tests/two-go-mods-one-failure/src/subdir1/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir1/test.go
rename to go/ql/integration-tests/two-go-mods-one-failure/src/subdir1/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir2/go.mod b/go/ql/integration-tests/two-go-mods-one-failure/src/subdir2/go.mod
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir2/go.mod
rename to go/ql/integration-tests/two-go-mods-one-failure/src/subdir2/go.mod
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir2/go.sum b/go/ql/integration-tests/two-go-mods-one-failure/src/subdir2/go.sum
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir2/go.sum
rename to go/ql/integration-tests/two-go-mods-one-failure/src/subdir2/go.sum
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir2/subsubdir2/add.go b/go/ql/integration-tests/two-go-mods-one-failure/src/subdir2/subsubdir2/add.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir2/subsubdir2/add.go
rename to go/ql/integration-tests/two-go-mods-one-failure/src/subdir2/subsubdir2/add.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir2/test.go b/go/ql/integration-tests/two-go-mods-one-failure/src/subdir2/test.go
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/src/subdir2/test.go
rename to go/ql/integration-tests/two-go-mods-one-failure/src/subdir2/test.go
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/test.expected b/go/ql/integration-tests/two-go-mods-one-failure/test.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/test.expected
rename to go/ql/integration-tests/two-go-mods-one-failure/test.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/test.py b/go/ql/integration-tests/two-go-mods-one-failure/test.py
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/test.py
rename to go/ql/integration-tests/two-go-mods-one-failure/test.py
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/test.ql b/go/ql/integration-tests/two-go-mods-one-failure/test.ql
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/test.ql
rename to go/ql/integration-tests/two-go-mods-one-failure/test.ql