diff --git a/credential/store/pom.xml b/credential/store/pom.xml
index ac6bc803d5c..159fc8d1c94 100644
--- a/credential/store/pom.xml
+++ b/credential/store/pom.xml
@@ -35,15 +35,47 @@
     <name>WildFly Elytron - Credential Store</name>
     <description>WildFly Security Credential Store SPIs and implementaions</description>
 
+    <build>
+        <plugins>
+            <!-- JAR -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>${version.jar.plugin}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- SOURCES -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>${version.source.plugin}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
     <dependencies>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-asn1</artifactId>
-        </dependency>    
+        </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-auth</artifactId>
-        </dependency>    
+        </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-auth-server</artifactId>
@@ -71,8 +103,8 @@
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-x500</artifactId>
-        </dependency>        
-                
+        </dependency>
+
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-annotations</artifactId>
@@ -82,7 +114,7 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
             <scope>provided</scope>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-processor</artifactId>
@@ -95,6 +127,11 @@
         </dependency>
 
         <!--Test scope-->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-password-impl</artifactId>
@@ -112,5 +149,5 @@
         </dependency>
 
     </dependencies>
-    
+
 </project>
diff --git a/tests/base/src/test/java/org/wildfly/security/credential/store/CredentialStoreBuilder.java b/credential/store/src/test/java/org/wildfly/security/credential/store/CredentialStoreBuilder.java
similarity index 100%
rename from tests/base/src/test/java/org/wildfly/security/credential/store/CredentialStoreBuilder.java
rename to credential/store/src/test/java/org/wildfly/security/credential/store/CredentialStoreBuilder.java
diff --git a/tests/base/src/test/java/org/wildfly/security/credential/store/KeystorePasswordStoreTest.java b/credential/store/src/test/java/org/wildfly/security/credential/store/KeystorePasswordStoreTest.java
similarity index 100%
rename from tests/base/src/test/java/org/wildfly/security/credential/store/KeystorePasswordStoreTest.java
rename to credential/store/src/test/java/org/wildfly/security/credential/store/KeystorePasswordStoreTest.java
diff --git a/pom.xml b/pom.xml
index aa3af819018..f652b709522 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
             </resource>
         </resources>
 
-        <plugins>        
+        <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -155,8 +155,8 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>        
-        
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
@@ -211,13 +211,13 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>com.github.ferstl</groupId>
                 <artifactId>depgraph-maven-plugin</artifactId>
                 <version>3.2.2</version>
             </plugin>
-            
+
         </plugins>
 
         <pluginManagement>
@@ -455,7 +455,7 @@
                                 <goal>aggregate</goal>
                             </goals>
                             <configuration>
-                                <destDir>api-javadoc</destDir>                                
+                                <destDir>api-javadoc</destDir>
                                 <sourceFileIncludes>
                                     <include>org/wildfly/security/*.java</include>
                                     <include>org/wildfly/security/asn1/*.java</include>
@@ -614,6 +614,12 @@
                 <artifactId>wildfly-elytron-credential-store</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wildfly.security</groupId>
+                <artifactId>wildfly-elytron-credential-store</artifactId>
+                <type>test-jar</type>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wildfly.security</groupId>
                 <artifactId>wildfly-elytron-client</artifactId>
@@ -727,7 +733,7 @@
                 <artifactId>wildfly-elytron-jose-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.wildfly.security</groupId>
                 <artifactId>wildfly-elytron-keystore</artifactId>
diff --git a/tests/base/pom.xml b/tests/base/pom.xml
index 10306ce7191..65327aaeed7 100644
--- a/tests/base/pom.xml
+++ b/tests/base/pom.xml
@@ -507,7 +507,7 @@
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-sasl-scram</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-x500</artifactId>
@@ -524,7 +524,7 @@
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-x500-principal</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
@@ -715,7 +715,12 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-credential-store</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.parsson</groupId>
             <artifactId>jakarta.json</artifactId>
@@ -843,7 +848,7 @@
                                 <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
                                 <breakBuildOnSourceIncompatibleModifications>true</breakBuildOnSourceIncompatibleModifications>
                                 <overrideCompatibilityChangeParameters>
-                                    <overrideCompatibilityChangeParameter> allowing new method in interface if default impl provided 
+                                    <overrideCompatibilityChangeParameter> allowing new method in interface if default impl provided
                                         <compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
                                         <binaryCompatible>true</binaryCompatible>
                                         <sourceCompatible>true</sourceCompatible>