diff --git a/bin/include/target-classpath.bat b/bin/include/target-classpath.bat
index 423f9849fa535..bd304c1a3383b 100644
--- a/bin/include/target-classpath.bat
+++ b/bin/include/target-classpath.bat
@@ -25,7 +25,7 @@
 
 @echo off
 
-for /D %%F in (%IGNITE_HOME%\os\modules\*) do if not %%F == "%IGNITE_HOME%\os\modules" call :includeToClassPath %%F
+for /D %%F in (modules\*) do if not %%F == "modules" call :includeToClassPath %%F
 
 for /D %%F in (%IGNITE_HOME%\modules\*) do if not %%F == "%IGNITE_HOME%\modules" call :includeToClassPath %%F
 
@@ -35,6 +35,8 @@ goto :eof
 if exist "%1\target\" (
     if exist "%1\target\classes\" call :concat %1\target\classes
 
+    if exist "%1\target\test-classes\" call :concat %1\target\test-classes
+
     if exist "%1\target\libs\" call :concat %1\target\libs\*
 )
 goto :eof
diff --git a/bin/include/target-classpath.sh b/bin/include/target-classpath.sh
index 03aa951e35dbb..62c9ffae7b8d6 100644
--- a/bin/include/target-classpath.sh
+++ b/bin/include/target-classpath.sh
@@ -49,6 +49,10 @@ includeToClassPath() {
                 IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/classes
             fi
 
+            if [ -d "${file}/target/test-classes" ]; then
+                IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/test-classes
+            fi
+
             if [ -d "${file}/target/libs" ]; then
                 IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/libs/*
             fi
@@ -57,11 +61,11 @@ includeToClassPath() {
 }
 
 #
-# Include target libraries for opensourse modules to classpath.
+# Include target libraries for enterprise modules to classpath.
 #
-includeToClassPath ${IGNITE_HOME}/os/modules
+includeToClassPath modules
 
 #
-# Include target libraries for enterprise modules to classpath.
+# Include target libraries for opensourse modules to classpath.
 #
 includeToClassPath ${IGNITE_HOME}/modules