Index: tests/ForwardingTests.m
==================================================================
--- tests/ForwardingTests.m
+++ tests/ForwardingTests.m
@@ -206,12 +206,12 @@
 	    isEqual: RESULT])
 	/*
 	 * Don't try fpret on Win64 if we don't have stret forwarding, as
 	 * long double is handled as a struct there.
 	 */
-# if !defined(OF_WINDOWS) || !defined(OF_X86_64) || \
-	defined(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET)
+# if !defined(OF_WINDOWS) || !defined(OF_AMD64) || \
+    defined(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET)
 	TEST(@"-[forwardingTargetForSelector:] fp return",
 	    [testObject forwardingTargetFPRetTest] == 12345678.00006103515625)
 # endif
 # ifdef OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET
 	TEST(@"-[forwardingTargetForSelector:] struct return",

Index: tests/OFSystemInfoTests.m
==================================================================
--- tests/OFSystemInfoTests.m
+++ tests/OFSystemInfoTests.m
@@ -82,11 +82,11 @@
 	    [OFSystemInfo CPUVendor]];
 
 	[OFStdOut writeFormat: @"[OFSystemInfo] CPU model: %@\n",
 	    [OFSystemInfo CPUModel]];
 
-#if defined(OF_X86_64) || defined(OF_X86)
+#if defined(OF_AMD64) || defined(OF_X86)
 	[OFStdOut writeFormat: @"[OFSystemInfo] Supports MMX: %d\n",
 	    [OFSystemInfo supportsMMX]];
 
 	[OFStdOut writeFormat: @"[OFSystemInfo] Supports 3DNow!: %d\n",
 	    [OFSystemInfo supports3DNow]];

Index: tests/RuntimeARCTests.m
==================================================================
--- tests/RuntimeARCTests.m
+++ tests/RuntimeARCTests.m
@@ -25,11 +25,11 @@
 @implementation RuntimeARCTest
 - (instancetype)init
 {
 	self = [super init];
 
-#if defined(OF_WINDOWS) && defined(OF_X86_64)
+#if defined(OF_WINDOWS) && defined(OF_AMD64)
 	/*
 	 * Clang has a bug on Windows where it creates an invalid call into
 	 * objc_retainAutoreleasedReturnValue(). Work around it by not using an
 	 * autoreleased exception.
 	 */