diff --git a/tests/backend/test-filedescriptors.c b/tests/backend/test-filedescriptors.c
index 65a1fd33c..26e020302 100644
--- a/tests/backend/test-filedescriptors.c
+++ b/tests/backend/test-filedescriptors.c
@@ -20,7 +20,7 @@
 */
 #include "lib/safeclib.h"
 
-#include "lumiera/config.h"
+#include "lib/config.h"
 #include "backend/backend.h"
 #include "backend/filedescriptor.h"
 
diff --git a/tests/backend/test-filehandles.c b/tests/backend/test-filehandles.c
index cec01a152..0b7d0ba30 100644
--- a/tests/backend/test-filehandles.c
+++ b/tests/backend/test-filehandles.c
@@ -20,8 +20,8 @@
 */
 #include "lib/llist.h"
 #include "lib/safeclib.h"
+#include "lib/config.h"
 
-#include "backend/config.h"
 #include "backend/backend.h"
 #include "backend/filehandlecache.h"
 
diff --git a/tests/backend/test-filemmap.c b/tests/backend/test-filemmap.c
index 6e7710520..e17b2e5d6 100644
--- a/tests/backend/test-filemmap.c
+++ b/tests/backend/test-filemmap.c
@@ -23,8 +23,8 @@
 //#include <string.h>
 
 #include "lib/llist.h"
+#include "lib/config.h"
 
-#include "backend/config.h"
 #include "backend/backend.h"
 #include "backend/file.h"
 #include "backend/filedescriptor.h"
diff --git a/tests/lumiera/hello_interface.h b/tests/lumiera/hello_interface.h
index 9cb25246f..8f04c7b93 100644
--- a/tests/lumiera/hello_interface.h
+++ b/tests/lumiera/hello_interface.h
@@ -1,4 +1,4 @@
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 
 /*
   one interface which can greet in different languages
diff --git a/tests/lumiera/test-config.c b/tests/lumiera/test-config.c
index cf215b7f2..c6d96557e 100644
--- a/tests/lumiera/test-config.c
+++ b/tests/lumiera/test-config.c
@@ -21,8 +21,8 @@
 */
 #include "lib/safeclib.h"
 
-#include "lumiera/config.h"
-#include "lumiera/configitem.h"
+#include "lib/config.h"
+#include "lib/configitem.h"
 
 #include "tests/test.h"
 
diff --git a/tests/lumiera/test-interfaces.c b/tests/lumiera/test-interfaces.c
index d85cf99dd..1f7d8b402 100644
--- a/tests/lumiera/test-interfaces.c
+++ b/tests/lumiera/test-interfaces.c
@@ -19,11 +19,11 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "lumiera/interface.h"
-#include "lumiera/interfaceregistry.h"
-#include "lumiera/interfacedescriptor.h"
-#include "lumiera/config.h"
-#include "lumiera/config_interface.h"
+#include "lib/interface.h"
+#include "lib/interfaceregistry.h"
+#include "lib/interfacedescriptor.h"
+#include "lib/config.h"
+#include "lib/config_interface.h"
 
 #include "tests/test.h"
 #include "tests/lumiera/hello_interface.h"
diff --git a/tests/plugin/example_plugin.c b/tests/plugin/example_plugin.c
index ee48fc828..c42f92b28 100644
--- a/tests/plugin/example_plugin.c
+++ b/tests/plugin/example_plugin.c
@@ -23,8 +23,8 @@
 
 #include <stdio.h>
 
-#include "lumiera/interfacedescriptor.h"
-#include "lumiera/config_interface.h"
+#include "lib/interfacedescriptor.h"
+#include "lib/config_interface.h"
 
 #include "tests/lumiera/hello_interface.h"