diff --git a/travis/test/nop.asm b/travis/test/nop.asm
new file mode 100644
index 000000000..c5c373639
--- /dev/null
+++ b/travis/test/nop.asm
@@ -0,0 +1,14 @@
+	bits 64
+
+	nop
+	o64 nop
+	pause
+	o64 pause
+
+	xchg ax,ax
+	xchg eax,eax
+	xchg rax,rax
+
+	rep xchg ax,ax
+	rep xchg eax,eax
+	rep xchg rax,rax
diff --git a/travis/test/nop.bin.t b/travis/test/nop.bin.t
new file mode 100644
index 000000000..b69bae188
--- /dev/null
+++ b/travis/test/nop.bin.t
@@ -0,0 +1 @@
+�H���H�f���H��f����H�
\ No newline at end of file
diff --git a/travis/test/nop.json b/travis/test/nop.json
new file mode 100644
index 000000000..ba1a7699f
--- /dev/null
+++ b/travis/test/nop.json
@@ -0,0 +1,12 @@
+[
+	{
+		"description": "Test nop instruction",
+		"id": "nop",
+		"format": "bin",
+		"source": "nop.asm",
+		"option": "-Ox",
+		"target": [
+			{ "output": "nop.bin" }
+		]
+	}
+]