diff --git a/actions/tests/CMakeLists.txt b/actions/tests/CMakeLists.txt
index fe9ee291ba458d88ee0fcaa18d7c0b82fdbb892d..64930f89fb9d6bdd8db67bca6d1ed3b4b59db7ad 100644
--- a/actions/tests/CMakeLists.txt
+++ b/actions/tests/CMakeLists.txt
@@ -3,18 +3,4 @@ set(ACTION_UNIT_TESTS
   test_actions.py # leave this as last item so it will be executed first!
 )
 
-#set(RAWMODEL_TEST_DATA
-#  data/loop/ext.pdb
-#  data/raw-modeling/compounds.chemlib
-#  data/raw-modeling/gly.pdb
-#  data/raw-modeling/ter.fasta
-#  data/raw-modeling/sep.pdb
-#  data/raw-modeling/sep.fasta
-#  data/raw-modeling/seq.fasta
-#  data/raw-modeling/ins.fasta
-#  data/raw-modeling/del.fasta
-#  data/raw-modeling/cbeta.pdb
-#  data/raw-modeling/cbeta.fasta
-#)
-
-promod3_unittest(MODULE actions SOURCES "${ACTION_UNIT_TESTS}")
\ No newline at end of file
+promod3_unittest(MODULE actions SOURCES "${ACTION_UNIT_TESTS}" TARGET actions)
\ No newline at end of file
diff --git a/cmake_support/PROMOD3.cmake b/cmake_support/PROMOD3.cmake
index 0566d66b84e5253a95f94cc3463b041567241ad0..ce2b285a78c60711a65ce00d2bf53decb9b9210f 100644
--- a/cmake_support/PROMOD3.cmake
+++ b/cmake_support/PROMOD3.cmake
@@ -673,7 +673,7 @@ add_dependencies(check codetest)
 #-------------------------------------------------------------------------------
 macro(promod3_unittest)
   set(_ARG_PREFIX promod3)
-  parse_argument_list(_ARG "MODULE;SOURCES;LINK;DATA" "" ${ARGN})
+  parse_argument_list(_ARG "MODULE;SOURCES;LINK;DATA;TARGET" "" ${ARGN})
   set(_SOURCES ${_ARG_SOURCES})
   set(CPP_TESTS)
   set(PY_TESTS)
@@ -684,6 +684,9 @@ macro(promod3_unittest)
   set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_BINARY_DIR}/tests/${_ARG_MODULE}")
   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
   add_custom_target("test_data_${_ARG_MODULE}")
+  if(_ARG_TARGET)
+    add_dependencies("test_data_${_ARG_MODULE}" "${_ARG_TARGET}")
+  endif(_ARG_TARGET)
   add_custom_command(TARGET "test_data_${_ARG_MODULE}" PRE_BUILD
     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR})
   if(_ARG_DATA)
diff --git a/cmake_support/doc/index.rst b/cmake_support/doc/index.rst
index ca224d7d0eb730c29dc1409317d30ebc68739963..cc3b70234db4bb62681ae41aad44b85074548a42 100644
--- a/cmake_support/doc/index.rst
+++ b/cmake_support/doc/index.rst
@@ -38,7 +38,8 @@ Unit Tests
                   promod3_unittest(MODULE name
                                    SOURCES source1 [source2 ...]
                                    [LINK library1/ linker flag1 [library2/ linker flag2 ...]]
-                                   [DATA data1 [data2 ...]])
+                                   [DATA data1 [data2 ...]]
+                                   [TARGET target])
 
   Add unit tests to |project|. Unit tests should go in module-wise so all
   source files containing test code go by a single call of
@@ -76,6 +77,9 @@ Unit Tests
     a path relative to this directory. That path will then be created in the
     build directory.
 
+  ``TARGET``
+    This defines an additional dependency for the unit test.
+
 .. Finding packages
 .. -----------------