diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am
index 5132a180a2..2e08a8494c 100644
--- a/src/Makefile_Eolian_Cxx.am
+++ b/src/Makefile_Eolian_Cxx.am
@@ -93,8 +93,8 @@ tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-b.$(OBJEXT): tests/eolian_cxx
 tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-c.$(OBJEXT): tests/eolian_cxx/c.eo.c tests/eolian_cxx/c.eo.h
 tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-d.$(OBJEXT): tests/eolian_cxx/d.eo.c tests/eolian_cxx/d.eo.h
 
-tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-name_name.$(OBJEXT): tests/eolian_cxx/name_name.eo.c tests/eolian_cxx/name_name.eo.h
-tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-name_name_cxx.$(OBJEXT): tests/eolian_cxx/name_name.eo.h tests/eolian_cxx/name_name.eo.hh
+tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-name_name.$(OBJEXT): tests/eolian_cxx/name_name.eo.c tests/eolian_cxx/name_name.eo.h tests/eolian_cxx/ns_name.eo.c tests/eolian_cxx/ns_name.eo.h tests/eolian_cxx/ns_name_other.eo.c tests/eolian_cxx/ns_name_other.eo.h
+tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-name_name_cxx.$(OBJEXT): tests/eolian_cxx/name_name.eo.h tests/eolian_cxx/name_name.eo.hh tests/eolian_cxx/ns_name.eo.h tests/eolian_cxx/ns_name.eo.hh tests/eolian_cxx/ns_name_other.eo.h tests/eolian_cxx/ns_name_other.eo.hh
 
 CLEANFILES += \
 tests/eolian_cxx/callback.eo.hh \
@@ -116,7 +116,16 @@ tests/eolian_cxx/d.eo.hh tests/eolian_cxx/d.eo.impl.hh tests/eolian_cxx/d.eo.c t
 tests/eolian_cxx/name_name.eo.hh \
 tests/eolian_cxx/name_name.eo.c \
 tests/eolian_cxx/name_name.eo.h \
-tests/eolian_cxx/name_name.eo.impl.hh
+tests/eolian_cxx/name_name.eo.impl.hh \
+tests/eolian_cxx/ns_name.eo.hh \
+tests/eolian_cxx/ns_name.eo.c \
+tests/eolian_cxx/ns_name.eo.h \
+tests/eolian_cxx/ns_name.eo.impl.hh \
+tests/eolian_cxx/ns_name_other.eo.hh \
+tests/eolian_cxx/ns_name_other.eo.c \
+tests/eolian_cxx/ns_name_other.eo.h \
+tests/eolian_cxx/ns_name_other.eo.impl.hh
+
 
 tests_eolian_cxx_eolian_cxx_suite_CXXFLAGS = \
 -I$(top_builddir)/src/lib/efl \
@@ -147,7 +156,9 @@ tests/eolian_cxx/a.eo \
 tests/eolian_cxx/b.eo \
 tests/eolian_cxx/c.eo \
 tests/eolian_cxx/d.eo \
-tests/eolian_cxx/name_name.eo
+tests/eolian_cxx/name_name.eo \
+tests/eolian_cxx/ns_name.eo \
+tests/eolian_cxx/ns_name_other.eo
 
 include Makefile_Eolian_Cxx_Helper.am
 
diff --git a/src/tests/eolian_cxx/name_name.c b/src/tests/eolian_cxx/name_name.c
index 50b65d9ee8..a4e9c06781 100644
--- a/src/tests/eolian_cxx/name_name.c
+++ b/src/tests/eolian_cxx/name_name.c
@@ -4,5 +4,15 @@
 struct Name_Name_Data {};
 typedef struct Name_Name_Data Name_Name_Data;
 
+struct Ns_Name_Data {};
+typedef struct Ns_Name_Data Ns_Name_Data;
+
+struct Ns_Name_Other_Data {};
+typedef struct Ns_Name_Other_Data Ns_Name_Other_Data;
+
 #include "name_name.eo.h"
 #include "name_name.eo.c"
+#include "ns_name.eo.h"
+#include "ns_name.eo.c"
+#include "ns_name_other.eo.h"
+#include "ns_name_other.eo.c"
diff --git a/src/tests/eolian_cxx/name_name_cxx.cc b/src/tests/eolian_cxx/name_name_cxx.cc
index 99087548f1..d5669bc5f6 100644
--- a/src/tests/eolian_cxx/name_name_cxx.cc
+++ b/src/tests/eolian_cxx/name_name_cxx.cc
@@ -3,4 +3,8 @@
 
 #include "name_name.eo.h"
 #include "name_name.eo.hh"
+#include "ns_name.eo.h"
+#include "ns_name.eo.hh"
+#include "ns_name_other.eo.h"
+#include "ns_name_other.eo.hh"
 
diff --git a/src/tests/eolian_cxx/ns_name.eo b/src/tests/eolian_cxx/ns_name.eo
new file mode 100644
index 0000000000..50ab890f82
--- /dev/null
+++ b/src/tests/eolian_cxx/ns_name.eo
@@ -0,0 +1,4 @@
+class Ns.Name {
+  legacy_prefix: null;
+}
+
diff --git a/src/tests/eolian_cxx/ns_name_other.eo b/src/tests/eolian_cxx/ns_name_other.eo
new file mode 100644
index 0000000000..64a563ff0e
--- /dev/null
+++ b/src/tests/eolian_cxx/ns_name_other.eo
@@ -0,0 +1,4 @@
+class Ns.Name.Other {
+  legacy_prefix: null;
+}
+