diff --git a/Tests/Jump/Library/CMakeLists.txt b/Tests/Jump/Library/CMakeLists.txt
index fce9c2042f..9d45ea44b8 100644
--- a/Tests/Jump/Library/CMakeLists.txt
+++ b/Tests/Jump/Library/CMakeLists.txt
@@ -1,19 +1 @@
-ADD_LIBRARY(jumpStatic STATIC jumpStatic.cxx)
-ADD_LIBRARY(jumpShared SHARED jumpShared.cxx)
-
-IF(WIN32)
-  SET(LIB_NAME
-    ${CMAKE_SHARED_LIBRARY_PREFIX}jumpShared${CMAKE_SHARED_LIBRARY_SUFFIX})
-  SET(EXE_DIR ${Jump_BINARY_DIR}/Executable)
-  IF(EXECUTABLE_OUTPUT_PATH)
-    SET(EXE_DIR ${EXECUTABLE_OUTPUT_PATH})
-  ENDIF(EXECUTABLE_OUTPUT_PATH)
-  SET(LIB_DIR ${Jump_BINARY_DIR}/Library)
-  IF(LIBRARY_OUTPUT_PATH)
-    SET(LIB_DIR ${LIBRARY_OUTPUT_PATH})
-  ENDIF(LIBRARY_OUTPUT_PATH)
-  ADD_CUSTOM_COMMAND(TARGET jumpShared
-    POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy
-    ${LIB_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME}
-    ${EXE_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME})
-ENDIF(WIN32)
+SUBDIRS(Static Shared)
diff --git a/Tests/Jump/Library/Shared/CMakeLists.txt b/Tests/Jump/Library/Shared/CMakeLists.txt
new file mode 100644
index 0000000000..f0e09afa54
--- /dev/null
+++ b/Tests/Jump/Library/Shared/CMakeLists.txt
@@ -0,0 +1,18 @@
+ADD_LIBRARY(jumpShared SHARED jumpShared.cxx)
+
+IF(WIN32)
+  SET(LIB_NAME
+    ${CMAKE_SHARED_LIBRARY_PREFIX}jumpShared${CMAKE_SHARED_LIBRARY_SUFFIX})
+  SET(EXE_DIR ${Jump_BINARY_DIR}/Executable)
+  IF(EXECUTABLE_OUTPUT_PATH)
+    SET(EXE_DIR ${EXECUTABLE_OUTPUT_PATH})
+  ENDIF(EXECUTABLE_OUTPUT_PATH)
+  SET(LIB_DIR ${Jump_BINARY_DIR}/Library)
+  IF(LIBRARY_OUTPUT_PATH)
+    SET(LIB_DIR ${LIBRARY_OUTPUT_PATH})
+  ENDIF(LIBRARY_OUTPUT_PATH)
+  ADD_CUSTOM_COMMAND(TARGET jumpShared
+    POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy
+    ${LIB_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME}
+    ${EXE_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME})
+ENDIF(WIN32)
diff --git a/Tests/Jump/Library/jumpShared.cxx b/Tests/Jump/Library/Shared/jumpShared.cxx
similarity index 100%
rename from Tests/Jump/Library/jumpShared.cxx
rename to Tests/Jump/Library/Shared/jumpShared.cxx
diff --git a/Tests/Jump/Library/Static/CMakeLists.txt b/Tests/Jump/Library/Static/CMakeLists.txt
new file mode 100644
index 0000000000..23e70c0b19
--- /dev/null
+++ b/Tests/Jump/Library/Static/CMakeLists.txt
@@ -0,0 +1 @@
+ADD_LIBRARY(jumpStatic STATIC jumpStatic.cxx)
diff --git a/Tests/Jump/Library/jumpStatic.cxx b/Tests/Jump/Library/Static/jumpStatic.cxx
similarity index 100%
rename from Tests/Jump/Library/jumpStatic.cxx
rename to Tests/Jump/Library/Static/jumpStatic.cxx