diff --git a/core/src/test/scala/com/microsoft/azure/synapse/ml/nbtest/DatabricksRapidsTests.scala b/core/src/test/scala/com/microsoft/azure/synapse/ml/nbtest/DatabricksRapidsTests.scala
index aadd6c9788..b549a153cf 100644
--- a/core/src/test/scala/com/microsoft/azure/synapse/ml/nbtest/DatabricksRapidsTests.scala
+++ b/core/src/test/scala/com/microsoft/azure/synapse/ml/nbtest/DatabricksRapidsTests.scala
@@ -5,11 +5,17 @@ package com.microsoft.azure.synapse.ml.nbtest
 
 import com.microsoft.azure.synapse.ml.nbtest.DatabricksUtilities._
 
+import com.microsoft.azure.synapse.ml.build.BuildInfo
+import com.microsoft.azure.synapse.ml.core.env.FileUtilities
+import com.microsoft.azure.synapse.ml.nbtest.DatabricksUtilities._
+
+import java.io.File
+import scala.collection.mutable.ListBuffer
+
 class DatabricksRapidsTests extends DatabricksTestHelper {
 
   val clusterId: String = createClusterInPool(GPUClusterName, AdbGpuRuntime, 1, GpuPoolId, RapidsInitScripts)
 
-  // We want to wait for 40 minutes for each test to complete
   databricksTestHelper(clusterId, GPULibraries, RapidsNotebooks)
 
   protected override def afterAll(): Unit = {
diff --git a/core/src/test/scala/com/microsoft/azure/synapse/ml/nbtest/DatabricksUtilities.scala b/core/src/test/scala/com/microsoft/azure/synapse/ml/nbtest/DatabricksUtilities.scala
index 3a34d6391f..55e0fbdfce 100644
--- a/core/src/test/scala/com/microsoft/azure/synapse/ml/nbtest/DatabricksUtilities.scala
+++ b/core/src/test/scala/com/microsoft/azure/synapse/ml/nbtest/DatabricksUtilities.scala
@@ -430,7 +430,7 @@ abstract class DatabricksTestHelper extends TestBase {
                            notebooks: Seq[File]): Unit = {
 
     println("Checking if cluster is active")
-    tryWithRetries(Seq.fill(60 * 40)(1000).toArray) { () =>
+    tryWithRetries(Seq.fill(60 * 20)(1000).toArray) { () =>
       assert(isClusterActive(clusterId))
     }
 
diff --git a/pipeline.yaml b/pipeline.yaml
index 22c581587e..854b054c7f 100644
--- a/pipeline.yaml
+++ b/pipeline.yaml
@@ -143,8 +143,6 @@ jobs:
         TEST-CLASS: "com.microsoft.azure.synapse.ml.nbtest.DatabricksCPUTests"
       databricks-gpu:
         TEST-CLASS: "com.microsoft.azure.synapse.ml.nbtest.DatabricksGPUTests"
-      databricks-rapids:
-        TEST-CLASS: "com.microsoft.azure.synapse.ml.nbtest.DatabricksRapidsTests"
       synapse:
         TEST-CLASS: "com.microsoft.azure.synapse.ml.nbtest.SynapseTests"
 #      ${{ if eq(parameters.runSynapseExtensionE2ETests, true) }}: