diff --git a/FIPS/src/test/java/net/snowflake/client/category/FipsTestSuite.java b/FIPS/src/test/java/net/snowflake/client/category/FipsTestSuite.java
index 2ca5ef8c1..8599cd701 100644
--- a/FIPS/src/test/java/net/snowflake/client/category/FipsTestSuite.java
+++ b/FIPS/src/test/java/net/snowflake/client/category/FipsTestSuite.java
@@ -1,9 +1,20 @@
-package net.snowflake.client.suites;
+package net.snowflake.client.category;
 
-import net.snowflake.client.category.TestTags;
 import org.junit.platform.suite.api.IncludeTags;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.platform.suite.api.ExcludePackages;
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.api.SuiteDisplayName;
 
-@BaseTestSuite
-@IncludeTags("fips")
+@Suite
+@SuiteDisplayName("Testowanie")
+@SelectPackages("net.snowflake.client")
+@ExcludePackages("net.snowflake.client.suites")
+@IncludeClassNamePatterns(".+")
 public class FipsTestSuite {
 }
diff --git a/FIPS/src/test/java/net/snowflake/client/jdbc/ConnectionFipsIT.java b/FIPS/src/test/java/net/snowflake/client/jdbc/ConnectionFipsIT.java
index 92f690d16..7e0270c9c 100644
--- a/FIPS/src/test/java/net/snowflake/client/jdbc/ConnectionFipsIT.java
+++ b/FIPS/src/test/java/net/snowflake/client/jdbc/ConnectionFipsIT.java
@@ -22,7 +22,6 @@
 import net.snowflake.client.AbstractDriverIT;
 import net.snowflake.client.DontRunOnGCP;
 import net.snowflake.client.DontRunOnGithubActions;
-import net.snowflake.client.category.TestCategoryFips;
 import net.snowflake.client.core.SecurityUtil;
 import org.apache.commons.codec.binary.Base64;
 import org.bouncycastle.crypto.CryptoServicesRegistrar;
diff --git a/ci/container/test_component.sh b/ci/container/test_component.sh
index ea9a39244..7088dd33e 100755
--- a/ci/container/test_component.sh
+++ b/ci/container/test_component.sh
@@ -94,6 +94,7 @@ elif [[ "$c" == "FipsTestSuite" ]]; then
         $MVNW_EXE -DjenkinsIT \
             -Djava.io.tmpdir=$WORKSPACE \
             -Djacoco.skip.instrument=false \
+            -Dtest=FipsTestSuite \
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
             -Dnot-self-contained-jar \
             verify \
diff --git a/src/test/java/net/snowflake/client/suites/BaseTestSuite.java b/src/test/java/net/snowflake/client/suites/BaseTestSuite.java
index d5727de18..494346295 100644
--- a/src/test/java/net/snowflake/client/suites/BaseTestSuite.java
+++ b/src/test/java/net/snowflake/client/suites/BaseTestSuite.java
@@ -5,6 +5,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import org.junit.platform.suite.api.ExcludePackages;
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectPackages;
 import org.junit.platform.suite.api.Suite;
 import org.junit.platform.suite.api.SuiteDisplayName;
@@ -15,4 +16,5 @@
 @SuiteDisplayName("Testowanie")
 @SelectPackages("net.snowflake.client")
 @ExcludePackages("net.snowflake.client.suites")
+@IncludeClassNamePatterns(".+")
 public @interface BaseTestSuite {}