diff --git a/test/DebugInfo/2010-01-18-DbgValue.ll b/test/CodeGen/X86/2010-01-18-DbgValue.ll
similarity index 94%
rename from test/DebugInfo/2010-01-18-DbgValue.ll
rename to test/CodeGen/X86/2010-01-18-DbgValue.ll
index 001f853dd23..207a1f7f945 100644
--- a/test/DebugInfo/2010-01-18-DbgValue.ll
+++ b/test/CodeGen/X86/2010-01-18-DbgValue.ll
@@ -1,7 +1,4 @@
 ; RUN: llc -O0 < %s | FileCheck %s
-; ModuleID = 'try.c'
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-n8:16:32"
-target triple = "i386-apple-darwin9.8"
 ; Currently, dbg.declare generates a DEBUG_VALUE comment.  Eventually it will
 ; generate DWARF and this test will need to be modified or removed.
 
diff --git a/test/DebugInfo/2010-02-01-DbgValueCrash.ll b/test/CodeGen/X86/2010-02-01-DbgValueCrash.ll
similarity index 98%
rename from test/DebugInfo/2010-02-01-DbgValueCrash.ll
rename to test/CodeGen/X86/2010-02-01-DbgValueCrash.ll
index 70103e5f72b..2113263c0ac 100644
--- a/test/DebugInfo/2010-02-01-DbgValueCrash.ll
+++ b/test/CodeGen/X86/2010-02-01-DbgValueCrash.ll
@@ -1,6 +1,5 @@
 ; RUN: llc -O1 < %s
 ; ModuleID = 'pr6157.bc'
-target triple = "x86_64-unknown-linux-gnu"
 ; formerly crashed in SelectionDAGBuilder
 
 %tart.reflect.ComplexType = type { double, double }
diff --git a/test/DebugInfo/2010-05-25-DotDebugLoc.ll b/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll
similarity index 99%
rename from test/DebugInfo/2010-05-25-DotDebugLoc.ll
rename to test/CodeGen/X86/2010-05-25-DotDebugLoc.ll
index 52e94842895..4c477ee7d05 100644
--- a/test/DebugInfo/2010-05-25-DotDebugLoc.ll
+++ b/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 < %s -mtriple=x86_64-apple-darwin | grep debug_loc12
+; RUN: llc -O2 < %s | grep debug_loc12
 ; Test to check .debug_loc support. This test case emits 13 debug_loc entries.
 
 %0 = type { double }
diff --git a/test/DebugInfo/2010-05-28-Crash.ll b/test/CodeGen/X86/2010-05-28-Crash.ll
similarity index 100%
rename from test/DebugInfo/2010-05-28-Crash.ll
rename to test/CodeGen/X86/2010-05-28-Crash.ll
diff --git a/test/DebugInfo/2010-06-01-DeadArg-DbgInfo.ll b/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll
similarity index 100%
rename from test/DebugInfo/2010-06-01-DeadArg-DbgInfo.ll
rename to test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll