diff --git a/tests/Makefile.am b/tests/Makefile.am
index 78cc3cd13b26922389f06a7a2995f6da607b937d..1135d93f30c285377a8a86e50f7e0fca1c94ee58 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -157,11 +157,11 @@ INJECTOR_OPS="\
 
 
 simple_interlock_client_1_SOURCES = simple_interlock_client.c
-simple_interlock_client_1_CPPFLAGS = $(AM_CPPFLAGS) -DCLIENT_ARGS=$(CLIENT1_OPS)
+simple_interlock_client_1_CPPFLAGS = $(AM_CPPFLAGS)  -DCOMPONENT_ID=1 -DCLIENT_ARGS=$(CLIENT1_OPS) 
 simple_interlock_client_2_SOURCES = simple_interlock_client.c
-simple_interlock_client_2_CPPFLAGS = $(AM_CPPFLAGS) -DCLIENT_ARGS=$(CLIENT2_OPS)
+simple_interlock_client_2_CPPFLAGS = $(AM_CPPFLAGS)  -DCOMPONENT_ID=2 -DCLIENT_ARGS=$(CLIENT2_OPS) 
 simple_injector_SOURCES = simple_interlock_client.c
-simple_injector_CPPFLAGS = $(AM_CPPFLAGS) -DCLIENT_ARGS=$(INJECTOR_OPS)
+simple_injector_CPPFLAGS = $(AM_CPPFLAGS) -DCOMPONENT_ID=0 -DCLIENT_ARGS=$(INJECTOR_OPS)
 
 simple_group_injector_SOURCES = simple_group_client.c
 simple_group_injector_CPPFLAGS = $(AM_CPPFLAGS) -DINJECT_GROUP_MEMBERS=1
diff --git a/tests/check_pm_interlock.sh.in b/tests/check_pm_interlock.sh.in
index ba7ee0d43463b90c395c0c2963f8bf73f4e1f3cd..a91f052b278dc6454b685a230a9d3a8ded6c7734 100644
--- a/tests/check_pm_interlock.sh.in
+++ b/tests/check_pm_interlock.sh.in
@@ -90,10 +90,10 @@ MSTRO_POOL_MANAGER_INFO="$pm_info"
 export MSTRO_POOL_MANAGER_INFO
 
 # start client 1
-(env MSTRO_COMPONENT_NAME="C1a" MSTRO_TRANSPORT_DEFAULT="MIO" MSTRO_MIO_CONFIG="./mio-config-C1a.yaml"  MSTRO_LOG_COLOR_ERRORS=1 MSTRO_LOG_COLOR="BLUE" ${CLIENT_CMD}_1 -n) || exit 99  &
+(env MSTRO_COMPONENT_NAME="Client" MSTRO_TRANSPORT_DEFAULT="MIO" MSTRO_MIO_CONFIG="./mio-config-C1a.yaml"  MSTRO_LOG_COLOR_ERRORS=1 MSTRO_LOG_COLOR="BLUE" ${CLIENT_CMD}_1 -n) || exit 99  &
 
 # start client 2
-(env MSTRO_COMPONENT_NAME="C2a" MSTRO_TRANSPORT_DEFAULT="MIO" MSTRO_MIO_CONFIG="./mio-config-C2a.yaml"  MSTRO_LOG_COLOR_ERRORS=1 MSTRO_LOG_COLOR="CYAN" ${CLIENT_CMD}_2 -n) || exit 99  &
+(env MSTRO_COMPONENT_NAME="Client" MSTRO_TRANSPORT_DEFAULT="MIO" MSTRO_MIO_CONFIG="./mio-config-C2a.yaml"  MSTRO_LOG_COLOR_ERRORS=1 MSTRO_LOG_COLOR="CYAN" ${CLIENT_CMD}_2 -n) || exit 99  &
 
 wait %1 || exit 99
 wait %2 || exit 99
diff --git a/tests/simple_interlock_client.c b/tests/simple_interlock_client.c
index a018c33cce13c7037ec9319b6b33bda1f1d91b3a..38d27d865fe438441f601ca491c55d99a2aa2dad 100644
--- a/tests/simple_interlock_client.c
+++ b/tests/simple_interlock_client.c
@@ -61,6 +61,12 @@
 #error You need to define CLIENT_ARGS when compiling this file
 #endif
 
+#ifndef COMPONENT_ID
+#error You need to define COMPONENT_ID when compiling this file
+#endif
+
+
+
 
 #define XSTRINGIFY(s) #s
 #define STRINGIFY(s) XSTRINGIFY(s)
@@ -267,7 +273,10 @@ CHEAT_DECLARE(
       )
 
 CHEAT_TEST(simple_interlock_client,
-           cheat_assert(MSTRO_OK == mstro_init(NULL,NULL,0));
+
+           char *component_id = STRINGIFY(COMPONENT_ID);
+           int my_id = atoi(component_id);
+           cheat_assert(MSTRO_OK == mstro_init(NULL,NULL,my_id));
            cheat_yield();
            cheat_assert(0==parse_args(g_client_args));
            cheat_assert(0==execute_steps(g_steps));