diff --git a/test/MC/AsmParser/X86/x86_32-bit.s b/test/MC/AsmParser/X86/x86-32-coverage.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86_32-bit.s
rename to test/MC/AsmParser/X86/x86-32-coverage.s
diff --git a/test/MC/AsmParser/X86/x86_32-new-encoder.s b/test/MC/AsmParser/X86/x86_32-new-encoder.s
index 612d1cd9a61..fd0fd750dfd 100644
--- a/test/MC/AsmParser/X86/x86_32-new-encoder.s
+++ b/test/MC/AsmParser/X86/x86_32-new-encoder.s
@@ -564,3 +564,22 @@ ljmp	$0x7ace,$0x7ace
 // rdar://8456370
 // CHECK: calll a
  calll a
+
+// CHECK:	incb	%al # encoding: [0xfe,0xc0]
+	incb %al
+
+// CHECK:	incw	%ax # encoding: [0x66,0x40]
+	incw %ax
+
+// CHECK:	incl	%eax # encoding: [0x40]
+	incl %eax
+
+// CHECK:	decb	%al # encoding: [0xfe,0xc8]
+	decb %al
+
+// CHECK:	decw	%ax # encoding: [0x66,0x48]
+	decw %ax
+
+// CHECK:	decl	%eax # encoding: [0x48]
+	decl %eax
+
diff --git a/test/MC/AsmParser/X86/x86_64-incl_decl.s b/test/MC/AsmParser/X86/x86_64-incl_decl.s
deleted file mode 100644
index 51315f83f2c..00000000000
--- a/test/MC/AsmParser/X86/x86_64-incl_decl.s
+++ /dev/null
@@ -1,26 +0,0 @@
-// RUN: llvm-mc -triple i386-unknown-unknown --show-encoding %s | FileCheck --check-prefix=CHECK-X86_32 %s
-// RUN: llvm-mc -triple x86_64-unknown-unknown --show-encoding %s | FileCheck --check-prefix=CHECK-X86_64 %s
-
-# CHECK-X86_32:	incb	%al # encoding: [0xfe,0xc0]
-# CHECK-X86_64:	incb	%al # encoding: [0xfe,0xc0]
-	incb %al
-
-# CHECK-X86_32:	incw	%ax # encoding: [0x66,0x40]
-# CHECK-X86_64:	incw	%ax # encoding: [0x66,0xff,0xc0]
-	incw %ax
-
-# CHECK-X86_32:	incl	%eax # encoding: [0x40]
-# CHECK-X86_64:	incl	%eax # encoding: [0xff,0xc0]
-	incl %eax
-
-# CHECK-X86_32:	decb	%al # encoding: [0xfe,0xc8]
-# CHECK-X86_64:	decb	%al # encoding: [0xfe,0xc8]
-	decb %al
-
-# CHECK-X86_32:	decw	%ax # encoding: [0x66,0x48]
-# CHECK-X86_64:	decw	%ax # encoding: [0x66,0xff,0xc8]
-	decw %ax
-
-# CHECK-X86_32:	decl	%eax # encoding: [0x48]
-# CHECK-X86_64:	decl	%eax # encoding: [0xff,0xc8]
-	decl %eax
diff --git a/test/MC/AsmParser/X86/x86_64-operands.s b/test/MC/AsmParser/X86/x86_64-operands.s
deleted file mode 100644
index 88f1a64cc42..00000000000
--- a/test/MC/AsmParser/X86/x86_64-operands.s
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: llvm-mc -triple x86_64-unknown-unknown %s | FileCheck %s
-
-# CHECK: callq a
-        callq a
-
-# CHECK: leaq	-40(%rbp), %r15
-	leaq	-40(%rbp), %r15
-
-
-
-// rdar://8013734 - Alias dr6=db6
-mov %dr6, %rax
-mov %db6, %rax
-# CHECK: movq	%dr6, %rax
-# CHECK: movq	%dr6, %rax
diff --git a/test/MC/AsmParser/X86/x86_64-suffix-matching.s b/test/MC/AsmParser/X86/x86_64-suffix-matching.s
deleted file mode 100644
index 0ae6fe502d1..00000000000
--- a/test/MC/AsmParser/X86/x86_64-suffix-matching.s
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: llvm-mc -triple x86_64 -o - %s | FileCheck %s
-
-// CHECK: addl $0, %eax
-        add $0, %eax
-// CHECK: addb $255, %al
-        add $0xFF, %al
-// CHECK: orq %rax, %rdx
-        or %rax, %rdx
-// CHECK: shlq $3, %rax
-        shl $3, %rax
diff --git a/test/MC/AsmParser/X86/x86_64.s b/test/MC/AsmParser/X86/x86_64.s
index e63b69799b3..d902aaae63a 100644
--- a/test/MC/AsmParser/X86/x86_64.s
+++ b/test/MC/AsmParser/X86/x86_64.s
@@ -2,6 +2,19 @@
 // RUN: FileCheck < %t %s
 // RUN: FileCheck --check-prefix=CHECK-STDERR < %t.err %s
 
+
+// Suffix inference:
+
+// CHECK: addl $0, %eax
+        add $0, %eax
+// CHECK: addb $255, %al
+        add $0xFF, %al
+// CHECK: orq %rax, %rdx
+        or %rax, %rdx
+// CHECK: shlq $3, %rax
+        shl $3, %rax
+
+
 // CHECK: subb %al, %al
         subb %al, %al
 
@@ -750,3 +763,26 @@ fildll -8(%rsp)
 // CHECK: fildll	-8(%rsp)
 // CHECK: encoding: [0xdf,0x6c,0x24,0xf8]
 
+// CHECK: callq a
+        callq a
+
+// CHECK: leaq	-40(%rbp), %r15
+	leaq	-40(%rbp), %r15
+
+
+
+// rdar://8013734 - Alias dr6=db6
+mov %dr6, %rax
+mov %db6, %rax
+// CHECK: movq	%dr6, %rax
+// CHECK: movq	%dr6, %rax
+
+
+// INC/DEC encodings.
+incb %al  // CHECK:	incb	%al # encoding: [0xfe,0xc0]
+incw %ax  // CHECK:	incw	%ax # encoding: [0x66,0xff,0xc0]
+incl %eax // CHECK:	incl	%eax # encoding: [0xff,0xc0]
+decb %al  // CHECK:	decb	%al # encoding: [0xfe,0xc8]
+decw %ax  // CHECK:	decw	%ax # encoding: [0x66,0xff,0xc8]
+decl %eax // CHECK:	decl	%eax # encoding: [0xff,0xc8]
+