diff --git a/ql/test/library-tests/semmle/go/Packages/package.expected b/ql/test/library-tests/semmle/go/Packages/package.expected
new file mode 100644
index 00000000000..256819c6151
--- /dev/null
+++ b/ql/test/library-tests/semmle/go/Packages/package.expected
@@ -0,0 +1,2 @@
+| PackageName/test |
+| PackageName/v2/test |
diff --git a/ql/test/library-tests/semmle/go/Packages/package.ql b/ql/test/library-tests/semmle/go/Packages/package.ql
new file mode 100644
index 00000000000..ff083b52aa7
--- /dev/null
+++ b/ql/test/library-tests/semmle/go/Packages/package.ql
@@ -0,0 +1,18 @@
+import go
+
+from string path
+where
+  (
+    path = "PackageName/v2/test" or // OK
+    path = "PackageName/test" or // OK
+    path = "PackageName//v//test" or // NOT OK
+    path = "PackageName//v/test" or // NOT OK
+    path = "PackageName/v//test" or // NOT OK
+    path = "PackageName/v/asd/v2/test" or // NOT OK
+    path = "PackageName/v/test" or // NOT OK
+    path = "PackageName//v2//test" or // NOT OK
+    path = "PackageName//v2/test" or // NOT OK
+    path = "PackageName/v2//test" // NOT OK
+  ) and
+  path = package("PackageName", "test")
+select path
diff --git a/ql/test/library-tests/semmle/go/Packages/packagePredicate.go b/ql/test/library-tests/semmle/go/Packages/packagePredicate.go
deleted file mode 100644
index dc0500dd1a3..00000000000
--- a/ql/test/library-tests/semmle/go/Packages/packagePredicate.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	_ "PackageName//v//test"      // Not OK
-	_ "PackageName//v/test"       // Not OK
-	_ "PackageName/test"          // OK
-	_ "PackageName/v//test"       // Not OK
-	_ "PackageName/v/asd/v2/test" // Not OK
-	_ "PackageName/v/test"        // Not OK
-
-	_ "PackageName//v2//test" // Not OK
-	_ "PackageName//v2/test"  // Not OK
-	_ "PackageName/v2//test"  // Not OK
-	_ "PackageName/v2/test"   //OK
-)
-
-func main() {
-	pkg.Foo()
-	fmt.Println("")
-}
diff --git a/ql/test/library-tests/semmle/go/Packages/predicate.expected b/ql/test/library-tests/semmle/go/Packages/predicate.expected
deleted file mode 100644
index fb9cf20d4d2..00000000000
--- a/ql/test/library-tests/semmle/go/Packages/predicate.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| package PackageName/test | PackageName/test |
-| package PackageName/v2/test | PackageName/v2/test |
diff --git a/ql/test/library-tests/semmle/go/Packages/predicate.ql b/ql/test/library-tests/semmle/go/Packages/predicate.ql
deleted file mode 100644
index 9a4cdd003ce..00000000000
--- a/ql/test/library-tests/semmle/go/Packages/predicate.ql
+++ /dev/null
@@ -1,8 +0,0 @@
-import go
-
-from Package pkg, string mod, string path
-where
-  packages(pkg, _, package(mod, path), _) and
-  mod = "PackageName" and
-  path = "test"
-select pkg, pkg.getPath()