diff --git a/rostests/apitests/CMakeLists.txt b/rostests/apitests/CMakeLists.txt
index b5837c2f2fd..45f4c60282a 100644
--- a/rostests/apitests/CMakeLists.txt
+++ b/rostests/apitests/CMakeLists.txt
@@ -9,7 +9,9 @@ add_subdirectory(com)
 add_subdirectory(crt)
 add_subdirectory(dciman32)
 add_subdirectory(gdi32)
+if(NOT ARCH STREQUAL "amd64")
 add_subdirectory(kernel32)
+endif()
 add_subdirectory(msvcrt)
 add_subdirectory(ntdll)
 add_subdirectory(powrprof)
diff --git a/rostests/apitests/crt/CMakeLists.txt b/rostests/apitests/crt/CMakeLists.txt
index 1f8f82662ad..1e77201d9a0 100644
--- a/rostests/apitests/crt/CMakeLists.txt
+++ b/rostests/apitests/crt/CMakeLists.txt
@@ -1,4 +1,6 @@
 
 include(ntdll_crt_apitest.cmake)
-include(crtdll_crt_apitest.cmake)
 include(msvcrt_crt_apitest.cmake)
+if(NOT ARCH STREQUAL "amd64")
+  include(crtdll_crt_apitest.cmake)
+endif()
diff --git a/rostests/tests/dllexport/dllexport_test.c b/rostests/tests/dllexport/dllexport_test.c
index 4f8922aaae3..84f03fc55a2 100644
--- a/rostests/tests/dllexport/dllexport_test.c
+++ b/rostests/tests/dllexport/dllexport_test.c
@@ -58,27 +58,33 @@ int main(int argc, char *argv[])
     ok_int(StdcallFunc1(str), 0x11);
     ok_int(StdcallFunc2(str), 0x11);
     ok_int(StdcallFunc3(str), 0x10011);
+#ifdef _M_IX86
     ok_int(StdcallFunc4(str), 0x21);
+#endif
     ok_int(StdcallFunc5(str), 0x10021);
 
+#ifdef _M_IX86
     ok_int(DecoratedStdcallFunc1(str), 0x21);
     ok_int(DecoratedStdcallFunc2(str), 0x11);
     //ok_int(DecoratedStdcallFunc3(str), 11);
     ok_int(DecoratedStdcallFunc4(str), 0x21);
     ok_int(DecoratedStdcallFunc5(str), 0x10021);
-
+#endif
     ok_int(FastcallFunc0(), 0x30);
     ok_int(FastcallFunc1(str), 0x31);
     ok_int(FastcallFunc2(str), 0x31);
     ok_int(FastcallFunc3(str), 0x10031);
+#ifdef _M_IX86
     ok_int(FastcallFunc4(str), 0x42);
     ok_int(FastcallFunc5(str), 0x10041);
+#endif
+#ifdef _M_IX86
     ok_int(DecoratedFastcallFunc1(str), 0x42);
     ok_int(DecoratedFastcallFunc2(str), 0x31);
     //ok_int(DecoratedFastcallFunc3(str), 11);
     ok_int(DecoratedFastcallFunc4(str), 0x42);
     ok_int(DecoratedFastcallFunc5(str), 0x10041);
-
+#endif
     ok_int(DataItem1, 0x51);
     ok_int(DataItem2, 0x51);
     ok_int(DataItem3, 0x10051);
diff --git a/rostests/tests/dllexport/dllexport_test_dll1.spec b/rostests/tests/dllexport/dllexport_test_dll1.spec
index a6f4860d52e..2a8d06cd340 100644
--- a/rostests/tests/dllexport/dllexport_test_dll1.spec
+++ b/rostests/tests/dllexport/dllexport_test_dll1.spec
@@ -13,35 +13,35 @@
 
 # Decorated export of a stdcall function
  @ stdcall _StdcallFunc1@4(ptr)
- @ stdcall _DecoratedStdcallFunc1@4(ptr)
+ @ stdcall -arch=i386 _DecoratedStdcallFunc1@4(ptr)
 
 # Redirected stdcall function
  @ stdcall StdcallFunc2(ptr) StdcallFunc1
  @ stdcall StdcallFunc3(ptr) dllexport_test_dll2.StdcallFunc1
- @ stdcall StdcallFunc4(ptr) _DecoratedStdcallFunc1@4
+ @ stdcall -arch=i386 StdcallFunc4(ptr) _DecoratedStdcallFunc1@4
  @ stdcall StdcallFunc5(ptr) dllexport_test_dll2._DecoratedStdcallFunc1@4
- @ stdcall _DecoratedStdcallFunc2@4(ptr) StdcallFunc1
-; @ stdcall _DecoratedStdcallFunc3@4(ptr) dllexport_test_dll2.StdcallFunc1 # This doesn't work with MSVC!
- @ stdcall _DecoratedStdcallFunc4@4(ptr) _DecoratedStdcallFunc1@4
- @ stdcall _DecoratedStdcallFunc5@4(ptr) dllexport_test_dll2._DecoratedStdcallFunc1@4
+ @ stdcall -arch=i386 _DecoratedStdcallFunc2@4(ptr) StdcallFunc1
+; @ stdcall -arch=i386 _DecoratedStdcallFunc3@4(ptr) dllexport_test_dll2.StdcallFunc1 # This doesn't work with MSVC!
+ @ stdcall -arch=i386 _DecoratedStdcallFunc4@4(ptr) _DecoratedStdcallFunc1@4
+ @ stdcall -arch=i386 _DecoratedStdcallFunc5@4(ptr) dllexport_test_dll2._DecoratedStdcallFunc1@4
 
 # Normal export of a fastcall function
  @ fastcall FastcallFunc0()
  @ fastcall FastcallFunc1(ptr)
 
 # Decorated export of a fastcall function
- @ fastcall @DecoratedFastcallFunc1@4(ptr)
+ @ fastcall -arch=i386 @DecoratedFastcallFunc1@4(ptr)
 
 # Redirected fastcall function
  @ fastcall FastcallFunc2(ptr) FastcallFunc1
  @ fastcall FastcallFunc3(ptr) dllexport_test_dll2.FastcallFunc1
- @ fastcall FastcallFunc4(ptr) @DecoratedFastcallFunc1@4
- @ fastcall FastcallFunc5(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4
+ @ fastcall -arch=i386 FastcallFunc4(ptr) @DecoratedFastcallFunc1@4
+ @ fastcall -arch=i386 FastcallFunc5(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4
 
- @ fastcall @DecoratedFastcallFunc2@4(ptr) FastcallFunc1
-; @ fastcall @DecoratedFastcallFunc3@4(ptr) dllexport_test_dll2.FastcallFunc1 # This doesn't work with MSVC!
- @ fastcall @DecoratedFastcallFunc4@4(ptr) @DecoratedFastcallFunc1@4
- @ fastcall @DecoratedFastcallFunc5@4(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4
+ @ fastcall -arch=i386 @DecoratedFastcallFunc2@4(ptr) FastcallFunc1
+; @ fastcall -arch=i386 @DecoratedFastcallFunc3@4(ptr) dllexport_test_dll2.FastcallFunc1 # This doesn't work with MSVC!
+ @ fastcall -arch=i386 @DecoratedFastcallFunc4@4(ptr) @DecoratedFastcallFunc1@4
+ @ fastcall -arch=i386 @DecoratedFastcallFunc5@4(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4
 
 # Normal export of data
  @ extern DataItem1
diff --git a/rostests/tests/dllexport/dllexport_test_dll2.spec b/rostests/tests/dllexport/dllexport_test_dll2.spec
index 28e147ac278..944c7bbdbfc 100644
--- a/rostests/tests/dllexport/dllexport_test_dll2.spec
+++ b/rostests/tests/dllexport/dllexport_test_dll2.spec
@@ -15,7 +15,7 @@
  @ fastcall FastcallFunc1(ptr)
 
 # Decorated export of a fastcall function
- @ fastcall @DecoratedFastcallFunc1@4(ptr)
+ @ fastcall -arch=i386 @DecoratedFastcallFunc1@4(ptr)
 
 # Normal export of data
  @ extern DataItem1
diff --git a/rostests/winetests/CMakeLists.txt b/rostests/winetests/CMakeLists.txt
index f6ad83289a8..90fa6faa4e8 100644
--- a/rostests/winetests/CMakeLists.txt
+++ b/rostests/winetests/CMakeLists.txt
@@ -77,7 +77,9 @@ add_subdirectory(rasapi32)
 add_subdirectory(regedit)
 add_subdirectory(riched20)
 add_subdirectory(riched32)
+if(NOT ARCH STREQUAL "amd64")
 add_subdirectory(rpcrt4)
+endif()
 add_subdirectory(rsaenh)
 add_subdirectory(schannel)
 add_subdirectory(scrrun)