diff --git a/repos/base/run/cap_integrity.run b/repos/base-foc/run/cap_integrity.run
similarity index 100%
rename from repos/base/run/cap_integrity.run
rename to repos/base-foc/run/cap_integrity.run
diff --git a/repos/base-nova/src/test/cap_integrity/main.cc b/repos/base-nova/src/test/cap_integrity/main.cc
deleted file mode 100644
index db38f33e3e..0000000000
--- a/repos/base-nova/src/test/cap_integrity/main.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * \brief  Testing capability integrity
- * \author Christian Prochaska
- * \author Alexander Boettcher
- * \date   2012-02-10
- *
- */
-
-/*
- * Copyright (C) 2008-2013 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU General Public License version 2.
- */
-
-#include <base/env.h>
-#include <log_session/connection.h>
-
-using namespace Genode;
-
-int main(int argc, char **argv)
-{
-	printf("--- capability integrity test ---\n");
-	/* try the first 1000 local name IDs */
-	for (unsigned local_name = 0; local_name < 1000; local_name++) {
-		Native_capability ram_cap = env()->ram_session_cap();
-		Log_session_capability log_session_cap =
-			reinterpret_cap_cast<Log_session>(ram_cap);
-		Log_session_client log_session_client(log_session_cap);
-		try {
-			log_session_client.write("test message");
-		} catch(...) { }
-	}
-
-	printf("--- finished capability integrity test ---\n");
-	return 0;
-}
diff --git a/repos/base-nova/src/test/cap_integrity/target.mk b/repos/base-nova/src/test/cap_integrity/target.mk
deleted file mode 100644
index edd745ba70..0000000000
--- a/repos/base-nova/src/test/cap_integrity/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET = test-cap_integrity
-SRC_CC = main.cc
-LIBS   = base
diff --git a/repos/base/src/test/cap_integrity/main.cc b/repos/base/src/test/cap_integrity/main.cc
deleted file mode 100644
index 1defcf8ec8..0000000000
--- a/repos/base/src/test/cap_integrity/main.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * \brief  Testing capability integrity
- * \author Christian Prochaska
- * \date   2012-02-10
- *
- */
-
-/*
- * Copyright (C) 2008-2013 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU General Public License version 2.
- */
-
-#include <base/env.h>
-#include <log_session/connection.h>
-
-using namespace Genode;
-
-int main(int argc, char **argv)
-{
-	printf("--- capability integrity test ---\n");
-
-	/* try the first 1000 local name IDs */
-	for (int local_name = 0; local_name < 1000; local_name++) {
-		Log_session_capability log_session_cap =
-			reinterpret_cap_cast<Log_session>(Native_capability(env()->ram_session_cap().dst(), local_name));
-		Log_session_client log_session_client(log_session_cap);
-		try {
-			log_session_client.write("test message");
-		} catch(...) { }
-	}
-
-	printf("--- finished capability integrity test ---\n");
-	return 0;
-}
diff --git a/repos/base/src/test/cap_integrity/target.mk b/repos/base/src/test/cap_integrity/target.mk
deleted file mode 100644
index edd745ba70..0000000000
--- a/repos/base/src/test/cap_integrity/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET = test-cap_integrity
-SRC_CC = main.cc
-LIBS   = base