diff --git a/tests/gui/test/mock-elm.hpp b/tests/gui/test/mock-elm.hpp
index 8078eebd2..501d03336 100644
--- a/tests/gui/test/mock-elm.hpp
+++ b/tests/gui/test/mock-elm.hpp
@@ -48,9 +48,7 @@
 #include "lib/test/event-log.hpp"
 #include "gui/model/tangible.hpp"
 #include "lib/diff/record.hpp"
-#include "test/nexus.hpp"
-
-//#include <boost/noncopyable.hpp>
+#include "test/test-nexus.hpp"
 #include <string>
 
 
diff --git a/tests/gui/test/nexus.cpp b/tests/gui/test/test-nexus.cpp
similarity index 96%
rename from tests/gui/test/nexus.cpp
rename to tests/gui/test/test-nexus.cpp
index 50ecd4d4b..d234a10b3 100644
--- a/tests/gui/test/nexus.cpp
+++ b/tests/gui/test/test-nexus.cpp
@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-/** @file test/nexus.cpp
+/** @file test/test-nexus.cpp
  ** Implementation of a fake UI backbone for testing.
  ** This compilation unit provides the actual setup for running a faked
  ** user interface from unit tests.
@@ -36,7 +36,7 @@
 //#include "lib/util.hpp"
 //#include "lib/symbol.hpp"
 //#include "include/logging.h"
-#include "test/nexus.hpp"
+#include "test/test-nexus.hpp"
 #include "gui/ctrl/nexus.hpp"
 #include "lib/depend.hpp"
 
diff --git a/tests/gui/test/nexus.hpp b/tests/gui/test/test-nexus.hpp
similarity index 92%
rename from tests/gui/test/nexus.hpp
rename to tests/gui/test/test-nexus.hpp
index 87fa9179e..7a08c3b0e 100644
--- a/tests/gui/test/nexus.hpp
+++ b/tests/gui/test/test-nexus.hpp
@@ -1,5 +1,5 @@
 /*
-  test/NEXUS.hpp  -  fake user interface backbone for test support
+  TEST-NEXUS.hpp  -  fake user interface backbone for test support
 
   Copyright (C)         Lumiera.org
     2015,               Hermann Vosseler <Ichthyostega@web.de>
@@ -21,7 +21,7 @@
 */
 
 
-/** @file test/nexus.hpp
+/** @file test/test-nexus.hpp
  ** A fake UI backbone for investigations and unit testing.
  ** Any relevant element within the Lumiera GTK UI is connected to the [UI-Bus][ui-bus.hpp]
  ** So for testing and investigation we need a white room setup to provide an instrumented
@@ -38,8 +38,8 @@
  */
 
 
-#ifndef GUI_TEST_NEXUS_H
-#define GUI_TEST_NEXUS_H
+#ifndef GUI_TEST_TEST_NEXUS_H
+#define GUI_TEST_TEST_NEXUS_H
 
 
 #include "lib/error.hpp"
@@ -83,4 +83,4 @@ namespace test{
   
   
 }} // namespace gui::test
-#endif /*GUI_TEST_NEXUS_H*/
+#endif /*GUI_TEST_TEST_NEXUS_H*/