diff --git a/regress/Makefile b/regress/Makefile
new file mode 100644
index 00000000..159489d0
--- /dev/null
+++ b/regress/Makefile
@@ -0,0 +1,11 @@
+CFLAGS+=-I../include
+LDFLAGS=-L.. -lunicorn
+
+TESTS=map_crash map_regs
+
+all: $(TESTS)
+
+clean:
+	rm -f $(TESTS)
+
+.PHONY: all clean
diff --git a/regress/map_crash.c b/regress/map_crash.c
new file mode 100644
index 00000000..e7bc78a7
--- /dev/null
+++ b/regress/map_crash.c
@@ -0,0 +1,29 @@
+#include <unicorn/unicorn.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#define UC_BUG_WRITE_SIZE 13000
+#define UC_BUG_WRITE_ADDR 0x1000
+
+int main() {
+	int size;
+	uint8_t *buf;
+	uch uh;
+	uc_err err = uc_open (UC_ARCH_X86, UC_MODE_64, &uh);
+	if (err) {
+		fprintf (stderr, "Cannot initialize unicorn\n");
+		return 1;
+	}
+	size = UC_BUG_WRITE_SIZE;
+	buf = malloc (size);
+	if (!buf) {
+		fprintf (stderr, "Cannot allocate\n");
+		return 1;
+	}
+	memset (buf, 0, size);
+	uc_mem_map (uh, UC_BUG_WRITE_ADDR, size);
+	uc_mem_write (uh, UC_BUG_WRITE_ADDR, buf, size);
+	uc_close (&uh);
+	return 0;
+}