diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in
index 9d2f8aa6d..c39a9c806 100644
--- a/Examples/test-suite/python/Makefile.in
+++ b/Examples/test-suite/python/Makefile.in
@@ -86,13 +86,6 @@ C_TEST_CASES += \
 
 include $(srcdir)/../common.mk
 
-BUILTIN_BROKEN = \
-    python_abstractbase.cpptest \
-
-BUILTIN_NOT_BROKEN = $(filter-out $(BUILTIN_BROKEN),$(NOT_BROKEN_TEST_CASES))
-
-builtin-check : $(BUILTIN_NOT_BROKEN)
-
 # Overridden variables here
 SCRIPTDIR    = .
 LIBS         = -L.
diff --git a/Examples/test-suite/python/python_abstractbase_runme3.py b/Examples/test-suite/python/python_abstractbase_runme3.py
index 94dee3ff7..9b189964d 100644
--- a/Examples/test-suite/python/python_abstractbase_runme3.py
+++ b/Examples/test-suite/python/python_abstractbase_runme3.py
@@ -3,6 +3,8 @@ from collections import *
 
 # This is expected to fail with -builtin option
 # Builtin types can't inherit from pure-python abstract bases
+if is_python_builtin():
+  exit(0)
 
 assert issubclass(Mapii, MutableMapping)
 assert issubclass(Multimapii, MutableMapping)
diff --git a/Examples/test-suite/python_abstractbase.i b/Examples/test-suite/python_abstractbase.i
index f72688237..65f3d9931 100644
--- a/Examples/test-suite/python_abstractbase.i
+++ b/Examples/test-suite/python_abstractbase.i
@@ -16,3 +16,11 @@ namespace std
   %template(IntVector) vector<int>;
   %template(IntList) list<int>;
 }
+
+%inline %{
+#ifdef SWIGPYTHON_BUILTIN
+bool is_python_builtin() { return true; }
+#else
+bool is_python_builtin() { return false; }
+#endif
+%}