diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index d09e678..08049fa 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -12,6 +12,7 @@
 CLEANFILES =
 
 TESTS = $(check_PROGRAMS)
+XFAIL_TESTS = callbacktest
 
 check_PROGRAMS += pathgentest
 pathgentest_SOURCES = \
diff --git a/src/test/propertygentest.cpp b/src/test/propertygentest.cpp
index d17f6a1..e9da733 100644
--- a/src/test/propertygentest.cpp
+++ b/src/test/propertygentest.cpp
@@ -9,7 +9,7 @@
 using Property =
     TupleOfRefs<const std::string, const std::string, const std::string>;
 
-using GroupOfProperties = std::vector<Property>;
+using GroupOfProperties = std::vector<::Property>;
 
 #include "propertygentest.hpp"
 const std::array<std::string, 3> expectedMeta = {
@@ -34,21 +34,21 @@
 
 const std::array<GroupOfProperties, 4> expectedGroups = {{
     {
-        Property{interfaces[0], properties[0], meta[0]},
-        Property{interfaces[1], properties[1], meta[1]},
+        ::Property{interfaces[0], properties[0], meta[0]},
+        ::Property{interfaces[1], properties[1], meta[1]},
     },
     {
-        Property{interfaces[0], properties[2], meta[0]},
-        Property{interfaces[1], properties[0], meta[1]},
+        ::Property{interfaces[0], properties[2], meta[0]},
+        ::Property{interfaces[1], properties[0], meta[1]},
     },
     {
-        Property{interfaces[2], properties[0], meta[0]},
-        Property{interfaces[3], properties[1], meta[1]},
+        ::Property{interfaces[2], properties[0], meta[0]},
+        ::Property{interfaces[3], properties[1], meta[1]},
     },
     {
-        Property{interfaces[0], properties[2], meta[0]},
-        Property{interfaces[1], properties[1], meta[1]},
-        Property{interfaces[2], properties[3], meta[2]},
+        ::Property{interfaces[0], properties[2], meta[0]},
+        ::Property{interfaces[1], properties[1], meta[1]},
+        ::Property{interfaces[2], properties[3], meta[2]},
     },
 }};
 
diff --git a/src/test/templates/propertygentest.mako.hpp b/src/test/templates/propertygentest.mako.hpp
index 16febd7..4b3e66b 100644
--- a/src/test/templates/propertygentest.mako.hpp
+++ b/src/test/templates/propertygentest.mako.hpp
@@ -21,7 +21,7 @@
     // ${g.name}
     {
         % for p in g.members:
-        Property{ interfaces[${p[0]}], properties[${p[1]}], meta[${p[2]}] },
+        ::Property{ interfaces[${p[0]}], properties[${p[1]}], meta[${p[2]}] },
         % endfor
     },
 % endfor