diff --git a/tests/regress/segfault_on_stop.py b/tests/regress/segfault_on_stop.py
new file mode 100755
index 00000000..8d577109
--- /dev/null
+++ b/tests/regress/segfault_on_stop.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+import regress
+import unicorn
+
+
+class SegfaultOnStop(regress.RegressTest):
+    def test(self):
+        unicorn.Uc(unicorn.UC_ARCH_X86, unicorn.UC_MODE_64).emu_stop()
+        self.assertTrue(True, "If not reached, then we have a crashing bug.")
+
+if __name__ == '__main__':
+    regress.main()