diff --git a/SWIG/Examples/test-suite/template_base_template.i b/SWIG/Examples/test-suite/template_base_template.i
index 7571fae69..d21814add 100644
--- a/SWIG/Examples/test-suite/template_base_template.i
+++ b/SWIG/Examples/test-suite/template_base_template.i
@@ -24,11 +24,11 @@
                                 typename traits<AF, AG>::res_type>
   {
   };
- 
- template class traits <double, double>;
+%}
+
+%{
  template class Function <double, double>;
  template class Class <double, double>;
-
 %}
  
 %template(traits_dd) traits <double, double>;
diff --git a/SWIG/Examples/test-suite/template_ns4.i b/SWIG/Examples/test-suite/template_ns4.i
index 3769f8d0b..f77f149d7 100644
--- a/SWIG/Examples/test-suite/template_ns4.i
+++ b/SWIG/Examples/test-suite/template_ns4.i
@@ -1,5 +1,6 @@
 %module template_ns4
 
+
 %inline %{
     namespace hello {
 
@@ -50,9 +51,19 @@
     {
       return Class<AF, RF>();
     }
-   
+
+
   }  
 %}
+
+%{  
+  namespace hello {
+    template class Function <Double, Double>;
+    template class ArithFunction <Double, Double>;
+    template class Class <Double, Double>;   
+  }  
+%}
+
  namespace hello {
   //
   // This complains only when using a namespace
diff --git a/SWIG/Examples/test-suite/template_tbase_template.i b/SWIG/Examples/test-suite/template_tbase_template.i
index 02e672c46..b890dc378 100644
--- a/SWIG/Examples/test-suite/template_tbase_template.i
+++ b/SWIG/Examples/test-suite/template_tbase_template.i
@@ -37,10 +37,10 @@
     return Class<AF, RF>();
   }
 
-  template class traits <Double, Double>;
+%}
+%{
   template class Function <Double, Double>;
-  template class Class <Double, Double>;
- 
+  template class Class <Double, Double>; 
 %}
  
 %template(traits_dd) traits <Double, Double>;