diff --git a/bolt/test/runtime/X86/Inputs/exceptions_split.cpp b/bolt/test/runtime/Inputs/exceptions_split.cpp
rename from bolt/test/runtime/X86/Inputs/exceptions_split.cpp
rename to bolt/test/runtime/Inputs/exceptions_split.cpp
--- a/bolt/test/runtime/X86/Inputs/exceptions_split.cpp
+++ b/bolt/test/runtime/Inputs/exceptions_split.cpp
@@ -3,31 +3,25 @@
 //
 // Record performance data with no args. Run test with 2 args.
 
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
 
-int foo()
-{
-  return 0;
-}
+int foo() { return 0; }
 
 void bar(int a) {
   if (a > 2 && a % 2)
     throw new int();
 }
 
-void filter_only(){
-  foo();
-}
+void filter_only() { foo(); }
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
   unsigned r = 0;
 
   uint64_t limit = (argc >= 2 ? 10 : 5000);
   for (uint64_t i = 0; i < limit; ++i) {
     i += foo();
-    try  {
+    try {
       bar(argc);
       try {
         if (argc >= 2)
diff --git a/bolt/test/runtime/X86/exceptions-instrumentation.test b/bolt/test/runtime/exceptions-instrumentation.test
rename from bolt/test/runtime/X86/exceptions-instrumentation.test
rename to bolt/test/runtime/exceptions-instrumentation.test
diff --git a/bolt/test/runtime/X86/pie-exceptions-split.test b/bolt/test/runtime/pie-exceptions-split.test
rename from bolt/test/runtime/X86/pie-exceptions-split.test
rename to bolt/test/runtime/pie-exceptions-split.test
--- a/bolt/test/runtime/X86/pie-exceptions-split.test
+++ b/bolt/test/runtime/pie-exceptions-split.test
@@ -16,9 +16,9 @@
 ## All calls to printf() should be from exception handling code that was
 ## recorded as cold during the profile collection run. Check that the calls
 ## are placed after the split point.
-CHECK-NOT: callq printf
+CHECK-NOT: printf
 CHECK: HOT-COLD SPLIT POINT
-CHECK:     callq printf
+CHECK:     printf
 
 ## Verify the output still executes correctly when the exception path is being
 ## taken.