diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in
index 2f66caa89..4e688989c 100644
--- a/Examples/test-suite/python/Makefile.in
+++ b/Examples/test-suite/python/Makefile.in
@@ -66,7 +66,7 @@ CPP_TEST_CASES += \
 	python_moduleimport \
 	python_overload_simple_cast \
 	python_pickle \
-	python_pybuf \
+	python_pybuffer \
 	python_pythoncode \
 	python_richcompare \
 	python_strict_unicode \
diff --git a/Examples/test-suite/python/python_pybuf_runme.py b/Examples/test-suite/python/python_pybuffer_runme.py
similarity index 50%
rename from Examples/test-suite/python/python_pybuf_runme.py
rename to Examples/test-suite/python/python_pybuffer_runme.py
index 58efe78bd..85cfb75d3 100644
--- a/Examples/test-suite/python/python_pybuf_runme.py
+++ b/Examples/test-suite/python/python_pybuffer_runme.py
@@ -1,9 +1,12 @@
 # run:
-#  python python_pybuf_runme.py benchmark
+#  python python_pybuffer_runme.py benchmark
 # for the benchmark, other wise the test case will be run
-import python_pybuf
+import python_pybuffer
 import sys
 
+def check(flag):
+    if not flag:
+        raise RuntimeError("Test failed")
 
 if len(sys.argv) >= 2 and sys.argv[1] == "benchmark":
     # run the benchmark
@@ -13,31 +16,31 @@ if len(sys.argv) >= 2 and sys.argv[1] == "benchmark":
     t = time.time()
     a = bytearray(b'hello world')
     for i in range(k):
-        python_pybuf.title1(a)
+        python_pybuffer.title1(a)
     print "Time used by bytearray:", time.time() - t
 
     t = time.time()
     b = 'hello world'
     for i in range(k):
-        python_pybuf.title2(b)
+        python_pybuffer.title2(b)
     print "Time used by string:", time.time() - t
 else:
     # run the test case
     buf1 = bytearray(10)
     buf2 = bytearray(50)
 
-    python_pybuf.func1(buf1)
-    assert buf1 == b'a' * 10
+    python_pybuffer.func1(buf1)
+    check(buf1 == b'a' * 10)
 
-    python_pybuf.func2(buf2)
-    assert buf2.startswith(b"Hello world!\x00")
+    python_pybuffer.func2(buf2)
+    check(buf2.startswith(b"Hello world!\x00"))
 
-    count = python_pybuf.func3(buf2)
-    assert count == 10  # number of alpha and number in 'Hello world!'
+    count = python_pybuffer.func3(buf2)
+    check(count == 10)  # number of alpha and number in 'Hello world!'
 
-    length = python_pybuf.func4(buf2)
-    assert length == 12
+    length = python_pybuffer.func4(buf2)
+    check(length == 12)
 
     buf3 = bytearray(b"hello")
-    python_pybuf.title1(buf3)
-    assert buf3 == b'Hello'
+    python_pybuffer.title1(buf3)
+    check(buf3 == b'Hello')
diff --git a/Examples/test-suite/python_pybuf.i b/Examples/test-suite/python_pybuffer.i
similarity index 97%
rename from Examples/test-suite/python_pybuf.i
rename to Examples/test-suite/python_pybuffer.i
index 5bdc98920..b46d8c36a 100644
--- a/Examples/test-suite/python_pybuf.i
+++ b/Examples/test-suite/python_pybuffer.i
@@ -1,4 +1,4 @@
-%module python_pybuf
+%module python_pybuffer
 %include <pybuffer.i>
 %include <cstring.i>
 /*functions for the test case*/