diff --git a/Examples/test-suite/director_extend.i b/Examples/test-suite/director_extend.i
index 515866ac66..cec930a420 100644
--- a/Examples/test-suite/director_extend.i
+++ b/Examples/test-suite/director_extend.i
@@ -18,6 +18,8 @@ namespace Swig {
 #endif
 %}
 
+// Some director implementations do not have Swig::director
+#if !defined(SWIGGO)
 %extend SpObject
 {
   size_t ExceptionMethod()
@@ -29,7 +31,8 @@ namespace Swig {
     size_t size = sizeof(Swig::Director);
     return size;
   }
-};
+}
+#endif
 
 
 %inline %{
diff --git a/Lib/go/goruntime.swg b/Lib/go/goruntime.swg
index 5a51fd4b6b..2468148187 100644
--- a/Lib/go/goruntime.swg
+++ b/Lib/go/goruntime.swg
@@ -196,13 +196,3 @@ void __go_panic_msg(const char *);
   if (!(expr)) { _swig_gopanic(msg); } else
 %}
 
-#ifdef __cplusplus
-/* We don't need a Swig::Director class, but the Swig testsuite
-  expects one.  */
-%insert(runtime) %{
-namespace Swig {
-  typedef int Director;
-}
-%}
-
-#endif