diff --git a/Source/OCMockTests/NSMethodSignatureOCMAdditionsTests.m b/Source/OCMockTests/NSMethodSignatureOCMAdditionsTests.m
index 71b735b7..c8ff1657 100644
--- a/Source/OCMockTests/NSMethodSignatureOCMAdditionsTests.m
+++ b/Source/OCMockTests/NSMethodSignatureOCMAdditionsTests.m
@@ -30,6 +30,10 @@ @interface NSMethodSignatureOCMAdditionsTests : XCTestCase
 
 @implementation NSMethodSignatureOCMAdditionsTests
 
+#ifndef __arm64__
+
+// Special structure return not really needed on arm64. And we should remove arm and i386 at some point...
+
 - (void)testDeterminesThatSpecialReturnIsNotNeededForNonStruct
 {
     const char *types = "i";
@@ -98,6 +102,9 @@ - (void)testArchDependentSpecialReturns
 #endif
 }
 
+#endif
+
+
 - (void)testNSMethodSignatureDebugDescriptionWorksTheWayWeExpectIt
 {
     const char *types = "{CATransform3D=ffffffffffffffff}";
diff --git a/Source/OCMockTests/OCMArgTests.m b/Source/OCMockTests/OCMArgTests.m
index b21a0aa5..1b2d3062 100644
--- a/Source/OCMockTests/OCMArgTests.m
+++ b/Source/OCMockTests/OCMArgTests.m
@@ -37,8 +37,8 @@ - (void)testValueMacroCreatesCorrectValueObjects
 {
     NSRange range = NSMakeRange(5, 5);
     XCTAssertEqualObjects(OCMOCK_VALUE(range), [NSValue valueWithRange:range]);
-#if !(TARGET_OS_IPHONE && TARGET_RT_64_BIT)
-    /* This should work everywhere but I can't get it to work on iOS 64-bit */
+#ifndef __arm64__
+    // This should work everywhere but I can't get it to work on arm64
     XCTAssertEqualObjects(OCMOCK_VALUE((BOOL){YES}), @YES);
 #endif
     XCTAssertEqualObjects(OCMOCK_VALUE(42), @42);