diff --git a/jvm-packages/create_jni.py b/jvm-packages/create_jni.py
index 81b13c398..6be7b451c 100755
--- a/jvm-packages/create_jni.py
+++ b/jvm-packages/create_jni.py
@@ -175,6 +175,7 @@ def native_build(args):
         maybe_makedirs("xgboost4j-spark-gpu/src/test/resources")
         for file in glob.glob("../demo/data/veterans_lung_cancer.csv"):
             cp(file, "xgboost4j-spark-gpu/src/test/resources")
+        cp("xgboost4j-spark/src/test/resources/rank.train.csv", "xgboost4j-spark-gpu/src/test/resources")
 
 
 if __name__ == "__main__":
diff --git a/jvm-packages/pom.xml b/jvm-packages/pom.xml
index 318d89cad..2a36e8e30 100644
--- a/jvm-packages/pom.xml
+++ b/jvm-packages/pom.xml
@@ -92,20 +92,14 @@
             </modules>
         </profile>
 
-        <!-- gpu profile with both cpu and gpu test suites -->
         <profile>
             <id>gpu</id>
-            <activation>
-                <property>
-                    <name>use.cuda</name>
-                    <value>ON</value>
-                </property>
-            </activation>
             <properties>
                <use.cuda>ON</use.cuda>
             </properties>
             <modules>
                 <module>xgboost4j</module>
+                <module>xgboost4j-spark</module>
                 <module>xgboost4j-spark-gpu</module>
             </modules>
         </profile>
diff --git a/jvm-packages/xgboost4j-spark-gpu/pom.xml b/jvm-packages/xgboost4j-spark-gpu/pom.xml
index 5eb86a5b3..348cb033b 100644
--- a/jvm-packages/xgboost4j-spark-gpu/pom.xml
+++ b/jvm-packages/xgboost4j-spark-gpu/pom.xml
@@ -27,6 +27,11 @@
             <artifactId>xgboost4j_2.12</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>ml.dmlc</groupId>
+            <artifactId>xgboost4j-spark_2.12</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-core_${scala.binary.version}</artifactId>
diff --git a/jvm-packages/xgboost4j-spark-gpu/src/main/scala/ml/dmlc/xgboost4j/scala/spark b/jvm-packages/xgboost4j-spark-gpu/src/main/scala/ml/dmlc/xgboost4j/scala/spark
deleted file mode 120000
index 0183cabb9..000000000
--- a/jvm-packages/xgboost4j-spark-gpu/src/main/scala/ml/dmlc/xgboost4j/scala/spark
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark
\ No newline at end of file
diff --git a/jvm-packages/xgboost4j-spark-gpu/src/main/scala/org b/jvm-packages/xgboost4j-spark-gpu/src/main/scala/org
deleted file mode 120000
index 1be6df45e..000000000
--- a/jvm-packages/xgboost4j-spark-gpu/src/main/scala/org
+++ /dev/null
@@ -1 +0,0 @@
-../../../../xgboost4j-spark/src/main/scala/org
\ No newline at end of file
diff --git a/jvm-packages/xgboost4j-spark-gpu/src/test/resources b/jvm-packages/xgboost4j-spark-gpu/src/test/resources
deleted file mode 120000
index 499c4ff4b..000000000
--- a/jvm-packages/xgboost4j-spark-gpu/src/test/resources
+++ /dev/null
@@ -1 +0,0 @@
-../../../xgboost4j-spark/src/test/resources
\ No newline at end of file