7 files changed, 10 insertions, 8 deletions
diff --git a/src/irmd/reg/tests/CMakeLists.txt b/src/irmd/reg/tests/CMakeLists.txt
index e33bd056..759d29b4 100644
--- a/src/irmd/reg/tests/CMakeLists.txt
+++ b/src/irmd/reg/tests/CMakeLists.txt
@@ -1,6 +1,8 @@
 get_filename_component(tmp ".." ABSOLUTE)
 get_filename_component(src_folder "${tmp}" NAME)
 
+compute_test_prefix()
+
 # Set include directories for tests
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
@@ -39,5 +41,5 @@ endif()
 
 foreach(test ${tests_to_run})
   get_filename_component(test_name ${test} NAME_WE)
-  add_test(irmd/reg/${test_name} ${CMAKE_CURRENT_BINARY_DIR}/${src_folder}_test ${test_name})
+  add_test(${TEST_PREFIX}/${test_name} ${CMAKE_CURRENT_BINARY_DIR}/${src_folder}_test ${test_name})
 endforeach(test)
diff --git a/src/irmd/reg/tests/flow_test.c b/src/irmd/reg/tests/flow_test.c
index 27fd61b0..2066c811 100644
--- a/src/irmd/reg/tests/flow_test.c
+++ b/src/irmd/reg/tests/flow_test.c
@@ -22,7 +22,7 @@
 
 #include "../flow.c"
 
-#include <ouroboros/test.h>
+#include <test/test.h>
 
 #include <string.h>
 
diff --git a/src/irmd/reg/tests/ipcp_test.c b/src/irmd/reg/tests/ipcp_test.c
index d7d8e524..6ab6443d 100644
--- a/src/irmd/reg/tests/ipcp_test.c
+++ b/src/irmd/reg/tests/ipcp_test.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
-#include <ouroboros/test.h>
+#include <test/test.h>
 
 #include "../ipcp.c"
 
diff --git a/src/irmd/reg/tests/name_test.c b/src/irmd/reg/tests/name_test.c
index 9071364b..5b42875e 100644
--- a/src/irmd/reg/tests/name_test.c
+++ b/src/irmd/reg/tests/name_test.c
@@ -23,7 +23,7 @@
 
 #include "../name.c"
 
-#include <ouroboros/test.h>
+#include <test/test.h>
 
 #define TEST_PID  65534
 #define TEST_PROG "/usr/bin/testprog"
diff --git a/src/irmd/reg/tests/proc_test.c b/src/irmd/reg/tests/proc_test.c
index df0527fb..d53f18ec 100644
--- a/src/irmd/reg/tests/proc_test.c
+++ b/src/irmd/reg/tests/proc_test.c
@@ -22,7 +22,7 @@
 
 #include "../proc.c"
 
-#include <ouroboros/test.h>
+#include <test/test.h>
 
 #define TEST_PID  65534
 #define TEST_PROG "usr/bin/testprog"
diff --git a/src/irmd/reg/tests/prog_test.c b/src/irmd/reg/tests/prog_test.c
index c394c222..3900e7d7 100644
--- a/src/irmd/reg/tests/prog_test.c
+++ b/src/irmd/reg/tests/prog_test.c
@@ -22,7 +22,7 @@
 
 #include "../prog.c"
 
-#include <ouroboros/test.h>
+#include <test/test.h>
 
 #define TEST_PROG "usr/bin/testprog"
 
diff --git a/src/irmd/reg/tests/reg_test.c b/src/irmd/reg/tests/reg_test.c
index 4699beab..e7ae1a97 100644
--- a/src/irmd/reg/tests/reg_test.c
+++ b/src/irmd/reg/tests/reg_test.c
@@ -23,7 +23,7 @@
 
 #include "../reg.c"
 
-#include <ouroboros/test.h>
+#include <test/test.h>
 
 #define TEST_PID      3666
 #define TEST_N_1_PID  3999
@@ -1471,7 +1471,7 @@ static int test_wait_ipcp_boot_fail(void)
         struct ipcp_info resp_info = {
                 .name  = TEST_IPCP,
                 .pid   = TEST_PID,
-                .state = IPCP_INIT
+                .state = IPCP_NULL
         };
 
         TEST_START();