diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 23c57cbab..08f3981ba 100644
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -371,14 +371,6 @@ if MONOLITHIC
 endif
 endif
 
-if USE_IMC_TEST
-  SUBDIRS += plugins/imc_test
-endif
-
-if USE_IMV_TEST
-  SUBDIRS += plugins/imv_test
-endif
-
 if USE_MEDSRV
   SUBDIRS += plugins/medsrv
 if MONOLITHIC
diff --git a/src/libimcv/Makefile.am b/src/libimcv/Makefile.am
index 4caa77c07..4df819db6 100644
--- a/src/libimcv/Makefile.am
+++ b/src/libimcv/Makefile.am
@@ -11,3 +11,13 @@ libimcv_la_SOURCES = \
 	ita/ita_attr_command.h ita/ita_attr_command.c \
 	pa_tnc/pa_tnc_msg.h pa_tnc/pa_tnc_msg.c \
 	pa_tnc/pa_tnc_attr.h pa_tnc/pa_tnc_attr.c
+
+SUBDIRS = .
+
+if USE_IMC_TEST
+  SUBDIRS += plugins/imc_test
+endif
+
+if USE_IMV_TEST
+  SUBDIRS += plugins/imv_test
+endif
diff --git a/src/libcharon/plugins/imc_test/Makefile.am b/src/libimcv/plugins/imc_test/Makefile.am
similarity index 100%
rename from src/libcharon/plugins/imc_test/Makefile.am
rename to src/libimcv/plugins/imc_test/Makefile.am
diff --git a/src/libcharon/plugins/imc_test/imc_test.c b/src/libimcv/plugins/imc_test/imc_test.c
similarity index 100%
rename from src/libcharon/plugins/imc_test/imc_test.c
rename to src/libimcv/plugins/imc_test/imc_test.c
diff --git a/src/libcharon/plugins/imc_test/imc_test_state.c b/src/libimcv/plugins/imc_test/imc_test_state.c
similarity index 100%
rename from src/libcharon/plugins/imc_test/imc_test_state.c
rename to src/libimcv/plugins/imc_test/imc_test_state.c
diff --git a/src/libcharon/plugins/imc_test/imc_test_state.h b/src/libimcv/plugins/imc_test/imc_test_state.h
similarity index 100%
rename from src/libcharon/plugins/imc_test/imc_test_state.h
rename to src/libimcv/plugins/imc_test/imc_test_state.h
diff --git a/src/libcharon/plugins/imv_test/Makefile.am b/src/libimcv/plugins/imv_test/Makefile.am
similarity index 100%
rename from src/libcharon/plugins/imv_test/Makefile.am
rename to src/libimcv/plugins/imv_test/Makefile.am
diff --git a/src/libcharon/plugins/imv_test/imv_test.c b/src/libimcv/plugins/imv_test/imv_test.c
similarity index 100%
rename from src/libcharon/plugins/imv_test/imv_test.c
rename to src/libimcv/plugins/imv_test/imv_test.c
diff --git a/src/libcharon/plugins/imv_test/imv_test_state.c b/src/libimcv/plugins/imv_test/imv_test_state.c
similarity index 100%
rename from src/libcharon/plugins/imv_test/imv_test_state.c
rename to src/libimcv/plugins/imv_test/imv_test_state.c
diff --git a/src/libcharon/plugins/imv_test/imv_test_state.h b/src/libimcv/plugins/imv_test/imv_test_state.h
similarity index 100%
rename from src/libcharon/plugins/imv_test/imv_test_state.h
rename to src/libimcv/plugins/imv_test/imv_test_state.h