diff --git a/Examples/test-suite/class_ignore.i b/Examples/test-suite/class_ignore.i
index 8c34c624f..c0b954cd1 100644
--- a/Examples/test-suite/class_ignore.i
+++ b/Examples/test-suite/class_ignore.i
@@ -39,5 +39,9 @@
   char *do_blah(Foo *f) {
     return f->blah();
   }
+
+  class ForwardClass;  
+  template <class C> class ForwardClassT;  
+  template<typename T1, typename T2> class PatchList;
 %}
 
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index ce185da0d..eb58fa401 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -45,6 +45,7 @@ LIBPREFIX  = lib
 
 # Broken C++ test cases. (Can be run individually using make testcase.cpptest.)
 CPP_TEST_BROKEN += \
+	constants \
 	cpp_broken \
 	namespace_union \
 	nested_comment \
diff --git a/Examples/test-suite/python/constants.i b/Examples/test-suite/constants.i
similarity index 100%
rename from Examples/test-suite/python/constants.i
rename to Examples/test-suite/constants.i
diff --git a/Examples/test-suite/template_expr.i b/Examples/test-suite/template_expr.i
index cf642c7cb..d6e3c3461 100644
--- a/Examples/test-suite/template_expr.i
+++ b/Examples/test-suite/template_expr.i
@@ -23,3 +23,14 @@ class X {};
 
 %template(X_1) X<1>;
 %template(X_m1) X<-1>;
+
+
+
+// bug 1338527
+
+
+%inline %{
+
+  template<typename, typename> class PatchList;
+
+%}