diff --git a/SWIG/Examples/test-suite/common.mk b/SWIG/Examples/test-suite/common.mk
index ab7b58ac1..4c48c627c 100644
--- a/SWIG/Examples/test-suite/common.mk
+++ b/SWIG/Examples/test-suite/common.mk
@@ -382,8 +382,8 @@ C_TEST_CASES += \
 MULTI_CPP_TEST_CASES += \
 	clientdata_prop \
 	imports \
-	template_typedef_import \
-	mod
+	mod \
+	template_typedef_import
 
 NOT_BROKEN_TEST_CASES =	$(CPP_TEST_CASES:=.cpptest) \
 			$(C_TEST_CASES:=.ctest) \
diff --git a/SWIG/Examples/test-suite/operator_overload.i b/SWIG/Examples/test-suite/operator_overload.i
index 0d25d16f3..2f3060903 100644
--- a/SWIG/Examples/test-suite/operator_overload.i
+++ b/SWIG/Examples/test-suite/operator_overload.i
@@ -66,6 +66,11 @@ see bottom for a set of possible tests
 %}
 #endif
 
+#ifdef SWIGPHP4
+%rename(AndOperator) operator &&;
+%rename(OrOperator) operator ||;
+#endif
+
 %inline %{
 
 #if defined(_MSC_VER)
diff --git a/SWIG/Examples/test-suite/ordering.i b/SWIG/Examples/test-suite/ordering.i
index 92b1f0427..258e7b1ff 100644
--- a/SWIG/Examples/test-suite/ordering.i
+++ b/SWIG/Examples/test-suite/ordering.i
@@ -2,12 +2,12 @@
 
 // Ruby used to fail on the ordering of the two Class declarations below
 
-struct Class {
+struct Klass {
   int variable;
 };
 
 %{
-struct Class {
+struct Klass {
   int variable;
 };
 %}
diff --git a/SWIG/Examples/test-suite/template_base_template.i b/SWIG/Examples/test-suite/template_base_template.i
index d3e7759ac..130dc390e 100644
--- a/SWIG/Examples/test-suite/template_base_template.i
+++ b/SWIG/Examples/test-suite/template_base_template.i
@@ -13,27 +13,27 @@
   };
  
   template <class ArgType, class ResType>
-  struct Function
+  struct Funktion
   {
   };
 
   // Egad!
   template <class AF, class AG>
-  struct Class
-    : Function<typename traits<AF, AG>::arg_type,
+  struct Klass
+    : Funktion<typename traits<AF, AG>::arg_type,
                                 typename traits<AF, AG>::res_type>
   {
   };
 %}
 
 %{
- template struct Function <double, double>;
- template struct Class <double, double>;
+ template struct Funktion <double, double>;
+ template struct Klass <double, double>;
 %}
  
 %template(traits_dd) traits <double, double>;
-%template(Function_dd) Function <double, double>;
-%template(Class_dd) Class <double, double>;
+%template(Funktion_dd) Funktion <double, double>;
+%template(Klass_dd) Klass <double, double>;