diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala
index 571ee6791e92f..f31e80574f7bf 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala
@@ -92,6 +92,8 @@ class PlanGenerationTestSuite
   // with the datasource.
   protected val testDataPath: Path = java.nio.file.Paths.get(
     "../",
+    "sql",
+    "connect",
     "common",
     "src",
     "test",
diff --git a/sql/connect/common/src/test/resources/query-tests/queries/read.json b/sql/connect/common/src/test/resources/query-tests/queries/read.json
index d5580c1321ec4..55fa5f6b7b11f 100644
--- a/sql/connect/common/src/test/resources/query-tests/queries/read.json
+++ b/sql/connect/common/src/test/resources/query-tests/queries/read.json
@@ -10,7 +10,7 @@
         "header": "true",
         "delimiter": ";"
       },
-      "paths": ["../common/src/test/resources/query-tests/test-data/people.csv"]
+      "paths": ["../sql/connect/common/src/test/resources/query-tests/test-data/people.csv"]
     }
   }
 }
\ No newline at end of file
diff --git a/sql/connect/common/src/test/resources/query-tests/queries/read.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read.proto.bin
index c50391bb1a8f7..79b2f8bb2a2d9 100644
Binary files a/sql/connect/common/src/test/resources/query-tests/queries/read.proto.bin and b/sql/connect/common/src/test/resources/query-tests/queries/read.proto.bin differ
diff --git a/sql/connect/common/src/test/resources/query-tests/queries/read_csv.json b/sql/connect/common/src/test/resources/query-tests/queries/read_csv.json
index ec1eed1c6cf35..a9682fe4d9d4d 100644
--- a/sql/connect/common/src/test/resources/query-tests/queries/read_csv.json
+++ b/sql/connect/common/src/test/resources/query-tests/queries/read_csv.json
@@ -5,7 +5,7 @@
   "read": {
     "dataSource": {
       "format": "csv",
-      "paths": ["../common/src/test/resources/query-tests/test-data/people.csv"]
+      "paths": ["../sql/connect/common/src/test/resources/query-tests/test-data/people.csv"]
     }
   }
 }
\ No newline at end of file
diff --git a/sql/connect/common/src/test/resources/query-tests/queries/read_csv.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_csv.proto.bin
index d8b5ca93f2f77..2aa1785936827 100644
Binary files a/sql/connect/common/src/test/resources/query-tests/queries/read_csv.proto.bin and b/sql/connect/common/src/test/resources/query-tests/queries/read_csv.proto.bin differ
diff --git a/sql/connect/common/src/test/resources/query-tests/queries/read_json.json b/sql/connect/common/src/test/resources/query-tests/queries/read_json.json
index 63dadc129dc8f..220b0ebd8de0b 100644
--- a/sql/connect/common/src/test/resources/query-tests/queries/read_json.json
+++ b/sql/connect/common/src/test/resources/query-tests/queries/read_json.json
@@ -5,7 +5,7 @@
   "read": {
     "dataSource": {
       "format": "json",
-      "paths": ["../common/src/test/resources/query-tests/test-data/people.json"]
+      "paths": ["../sql/connect/common/src/test/resources/query-tests/test-data/people.json"]
     }
   }
 }
\ No newline at end of file
diff --git a/sql/connect/common/src/test/resources/query-tests/queries/read_json.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_json.proto.bin
index 1d829df6bbcfe..f76b586c64cdb 100644
Binary files a/sql/connect/common/src/test/resources/query-tests/queries/read_json.proto.bin and b/sql/connect/common/src/test/resources/query-tests/queries/read_json.proto.bin differ
diff --git a/sql/connect/common/src/test/resources/query-tests/queries/read_orc.json b/sql/connect/common/src/test/resources/query-tests/queries/read_orc.json
index b78d7d6ecd61c..15492565e9440 100644
--- a/sql/connect/common/src/test/resources/query-tests/queries/read_orc.json
+++ b/sql/connect/common/src/test/resources/query-tests/queries/read_orc.json
@@ -5,7 +5,7 @@
   "read": {
     "dataSource": {
       "format": "orc",
-      "paths": ["../common/src/test/resources/query-tests/test-data/users.orc"]
+      "paths": ["../sql/connect/common/src/test/resources/query-tests/test-data/users.orc"]
     }
   }
 }
\ No newline at end of file
diff --git a/sql/connect/common/src/test/resources/query-tests/queries/read_orc.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_orc.proto.bin
index 6a67db561dc88..701a5764b3e22 100644
Binary files a/sql/connect/common/src/test/resources/query-tests/queries/read_orc.proto.bin and b/sql/connect/common/src/test/resources/query-tests/queries/read_orc.proto.bin differ
diff --git a/sql/connect/common/src/test/resources/query-tests/queries/read_parquet.json b/sql/connect/common/src/test/resources/query-tests/queries/read_parquet.json
index 0a201a43c744b..d321a88c3326f 100644
--- a/sql/connect/common/src/test/resources/query-tests/queries/read_parquet.json
+++ b/sql/connect/common/src/test/resources/query-tests/queries/read_parquet.json
@@ -5,7 +5,7 @@
   "read": {
     "dataSource": {
       "format": "parquet",
-      "paths": ["../common/src/test/resources/query-tests/test-data/users.parquet"]
+      "paths": ["../sql/connect/common/src/test/resources/query-tests/test-data/users.parquet"]
     }
   }
 }
\ No newline at end of file
diff --git a/sql/connect/common/src/test/resources/query-tests/queries/read_parquet.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_parquet.proto.bin
index f16b28dcce01e..a205e1b37e483 100644
Binary files a/sql/connect/common/src/test/resources/query-tests/queries/read_parquet.proto.bin and b/sql/connect/common/src/test/resources/query-tests/queries/read_parquet.proto.bin differ
diff --git a/sql/connect/common/src/test/resources/query-tests/queries/read_text.json b/sql/connect/common/src/test/resources/query-tests/queries/read_text.json
index de7a306a52fbc..53493a64a7629 100644
--- a/sql/connect/common/src/test/resources/query-tests/queries/read_text.json
+++ b/sql/connect/common/src/test/resources/query-tests/queries/read_text.json
@@ -5,7 +5,7 @@
   "read": {
     "dataSource": {
       "format": "text",
-      "paths": ["../common/src/test/resources/query-tests/test-data/people.txt"]
+      "paths": ["../sql/connect/common/src/test/resources/query-tests/test-data/people.txt"]
     }
   }
 }
\ No newline at end of file
diff --git a/sql/connect/common/src/test/resources/query-tests/queries/read_text.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_text.proto.bin
index 3f3bbf8769c4d..6b9da3739e71a 100644
Binary files a/sql/connect/common/src/test/resources/query-tests/queries/read_text.proto.bin and b/sql/connect/common/src/test/resources/query-tests/queries/read_text.proto.bin differ