@@ -28,11 +28,11 @@
 extern void *_NSConcreteGlobalBlock;
 extern void *_NSConcreteMallocBlock;
 #endif
 
 /* Clang on Win32 generates broken code that crashes for global blocks. */
-#if !defined(OF_WINDOWS) || !defined(OF_X86) || !defined(__clang__)
+#if !defined(OF_WINDOWS) || !defined(__clang__)
 static void (^globalBlock)(void) = ^ {};
 #endif
 
 static int
 (^returnStackBlock(void))(void)
@@ -70,11 +70,11 @@
 
 	TEST(@"Class of stack block",
 	    (Class)&_NSConcreteStackBlock == objc_getClass("OFStackBlock") &&
 	    [stackBlock isKindOfClass: [OFBlock class]])
 
-#if !defined(OF_WINDOWS) || !defined(OF_X86) || !defined(__clang__)
+#if !defined(OF_WINDOWS) || !defined(__clang__)
 	TEST(@"Class of global block",
 	    (Class)&_NSConcreteGlobalBlock == objc_getClass("OFGlobalBlock") &&
 	    [globalBlock isKindOfClass: [OFBlock class]])
 #endif
 
@@ -91,11 +91,11 @@
 
 	TEST(@"Copying a stack block and using its copied variable",
 	    (voidBlock = returnStackBlock()) && voidBlock() == 43 &&
 	    voidBlock() == 44 && voidBlock() == 45)
 
-#if !defined(OF_WINDOWS) || !defined(OF_X86) || !defined(__clang__)
+#if !defined(OF_WINDOWS) || !defined(__clang__)
 	TEST(@"Copying a global block",
 	    (id)globalBlock == [[globalBlock copy] autorelease])
 #endif
 
 #ifndef __clang_analyzer__
@@ -104,11 +104,11 @@
 	    [mallocBlock retainCount] == 2)
 #endif
 
 	TEST(@"Autorelease a stack block", R([stackBlock autorelease]))
 
-#if !defined(OF_WINDOWS) || !defined(OF_X86) || !defined(__clang__)
+#if !defined(OF_WINDOWS) || !defined(__clang__)
 	TEST(@"Autorelease a global block", R([globalBlock autorelease]))
 #endif
 
 #ifndef __clang_analyzer__
 	TEST(@"Autorelease a malloc block", R([mallocBlock autorelease]))