diff --git a/test/MC/X86/x86_nop.s b/test/MC/X86/x86_nop.s
new file mode 100644
index 00000000000..37dec252b72
--- /dev/null
+++ b/test/MC/X86/x86_nop.s
@@ -0,0 +1,7 @@
+# RUN: llvm-mc -filetype=obj -mcpu=geode %s -o %t
+# RUN: llvm-objdump -disassemble %t | FileCheck %s
+
+# CHECK-NOT: nopw
+inc %eax
+.align 8
+inc %eax