diff --git a/credential/source/impl/pom.xml b/credential/source/impl/pom.xml
index 64e2fb398a1..b1fb5aa238e 100644
--- a/credential/source/impl/pom.xml
+++ b/credential/source/impl/pom.xml
@@ -59,8 +59,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>
@@ -70,17 +70,29 @@
             <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>
             <scope>provided</scope>
-        </dependency>  
-                
+        </dependency>
+
         <dependency>
             <groupId>org.wildfly.common</groupId>
             <artifactId>wildfly-common</artifactId>
         </dependency>
+
+        <!-- Test Scope -->
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-password-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/tests/base/src/test/java/org/wildfly/security/credential/source/impl/CommandCredentialSourceTest.java b/credential/source/impl/src/test/java/org/wildfly/security/credential/source/impl/CommandCredentialSourceTest.java
similarity index 78%
rename from tests/base/src/test/java/org/wildfly/security/credential/source/impl/CommandCredentialSourceTest.java
rename to credential/source/impl/src/test/java/org/wildfly/security/credential/source/impl/CommandCredentialSourceTest.java
index c41d01bbccd..85a162184e3 100644
--- a/tests/base/src/test/java/org/wildfly/security/credential/source/impl/CommandCredentialSourceTest.java
+++ b/credential/source/impl/src/test/java/org/wildfly/security/credential/source/impl/CommandCredentialSourceTest.java
@@ -31,7 +31,6 @@
 import org.wildfly.security.password.Password;
 import org.wildfly.security.password.interfaces.ClearPassword;
 
-// has dependency on wildfly-credential-source-deprecated
 public class CommandCredentialSourceTest {
     @Test
     public void testCommand() throws GeneralSecurityException, IOException {
@@ -66,19 +65,4 @@ private static void addCommand(final CommandCredentialSource.Builder builder) {
         builder.addCommand("-cp").addCommand(System.getProperty("java.class.path")).addCommand(CredentialCommand.class.getName());
     }
 
-    private static String buildExternalCommand(final String extOption, final String delimiter, final String argument) {
-        // First check for java.exe or java as the binary
-        File java = new File(System.getProperty("java.home"), "/bin/java");
-        File javaExe = new File(System.getProperty("java.home"), "/bin/java.exe");
-        String jre;
-        if (java.exists())
-            jre = java.getAbsolutePath();
-        else
-            jre = javaExe.getAbsolutePath();
-        // Build the command to run this jre
-        String cmd = jre + delimiter + "-cp" + delimiter + System.getProperty("java.class.path") + delimiter
-                + CredentialCommand.class.getName() + (argument != null ? delimiter + argument : "");
-        return extOption + cmd;
-    }
-
 }
diff --git a/tests/base/src/test/java/org/wildfly/security/credential/source/impl/CredentialCommand.java b/credential/source/impl/src/test/java/org/wildfly/security/credential/source/impl/CredentialCommand.java
similarity index 95%
rename from tests/base/src/test/java/org/wildfly/security/credential/source/impl/CredentialCommand.java
rename to credential/source/impl/src/test/java/org/wildfly/security/credential/source/impl/CredentialCommand.java
index cc33120450c..9fadfbca0f9 100644
--- a/tests/base/src/test/java/org/wildfly/security/credential/source/impl/CredentialCommand.java
+++ b/credential/source/impl/src/test/java/org/wildfly/security/credential/source/impl/CredentialCommand.java
@@ -21,9 +21,9 @@
  * Class that simulates credential command for tests.
  * @author <a href="mailto:pskopek@redhat.com">Peter Skopek</a>
  */
-public class CredentialCommand {
+class CredentialCommand {
 
-    private CredentialCommand() {
+    CredentialCommand() {
 
     }