diff --git a/bolt/test/X86/Inputs/icf-jump-tables.c b/bolt/test/Inputs/icf-jump-tables.c
rename from bolt/test/X86/Inputs/icf-jump-tables.c
rename to bolt/test/Inputs/icf-jump-tables.c
diff --git a/bolt/test/X86/Inputs/jump_table_icp.cpp b/bolt/test/Inputs/jump_table_icp.cpp
rename from bolt/test/X86/Inputs/jump_table_icp.cpp
rename to bolt/test/Inputs/jump_table_icp.cpp
diff --git a/bolt/test/X86/R_X86_64_64.pic.lld.cpp b/bolt/test/R_ABS.pic.lld.cpp
rename from bolt/test/X86/R_X86_64_64.pic.lld.cpp
rename to bolt/test/R_ABS.pic.lld.cpp
diff --git a/bolt/test/X86/icf-jump-tables.test b/bolt/test/X86/icf-jump-tables.test
--- a/bolt/test/X86/icf-jump-tables.test
+++ b/bolt/test/X86/icf-jump-tables.test
@@ -3,7 +3,7 @@
 
 # REQUIRES: system-linux
 
-# RUN: %clang %cflags -O1 -g %p/Inputs/icf-jump-tables.c -o %t.exe -Wl,-q
+# RUN: %clang %cflags -O1 -g %p/../Inputs/icf-jump-tables.c -o %t.exe -Wl,-q
 # RUN: llvm-bolt %t.exe -icf -o %t.bolt |& FileCheck %s
 
 ## Check that BOLT successfully folded a function with jump table:
diff --git a/bolt/test/X86/bad-exe.test b/bolt/test/bad-exe.test
rename from bolt/test/X86/bad-exe.test
rename to bolt/test/bad-exe.test
diff --git a/bolt/test/X86/bolt-info.test b/bolt/test/bolt-info.test
rename from bolt/test/X86/bolt-info.test
rename to bolt/test/bolt-info.test
diff --git a/bolt/test/X86/invalid-profile.test b/bolt/test/invalid-profile.test
rename from bolt/test/X86/invalid-profile.test
rename to bolt/test/invalid-profile.test
diff --git a/bolt/test/X86/no-relocs.test b/bolt/test/no-relocs.test
rename from bolt/test/X86/no-relocs.test
rename to bolt/test/no-relocs.test
diff --git a/bolt/test/X86/pie.test b/bolt/test/pie.test
rename from bolt/test/X86/pie.test
rename to bolt/test/pie.test
diff --git a/bolt/test/X86/re-optimize.test b/bolt/test/re-optimize.test
rename from bolt/test/X86/re-optimize.test
rename to bolt/test/re-optimize.test
diff --git a/bolt/test/X86/shared-object.test b/bolt/test/shared-object.test
rename from bolt/test/X86/shared-object.test
rename to bolt/test/shared-object.test