diff --git a/FBSnapshotTestCase/FBSnapshotTestCasePlatform.m b/FBSnapshotTestCase/FBSnapshotTestCasePlatform.m
index e7ee8e8..9d28bb8 100644
--- a/FBSnapshotTestCase/FBSnapshotTestCasePlatform.m
+++ b/FBSnapshotTestCase/FBSnapshotTestCasePlatform.m
@@ -21,13 +21,11 @@ BOOL FBSnapshotTestCaseIs64Bit(void)
 
 NSOrderedSet *FBSnapshotTestCaseDefaultSuffixes(void)
 {
-    NSMutableOrderedSet *suffixesSet = [[NSMutableOrderedSet alloc] init];
-    [suffixesSet addObject:@"_32"];
-    [suffixesSet addObject:@"_64"];
     if (FBSnapshotTestCaseIs64Bit()) {
-        return [suffixesSet reversedOrderedSet];
+        return [NSOrderedSet orderedSetWithObject:@"_64"];
+    } else {
+        return [NSOrderedSet orderedSetWithObject:@"_32"];
     }
-    return [suffixesSet copy];
 }
 
 NSString *FBFileNameIncludeNormalizedFileNameFromOption(NSString *fileName, FBSnapshotTestCaseFileNameIncludeOption option)
@@ -54,7 +52,7 @@ BOOL FBSnapshotTestCaseIs64Bit(void)
     [invalidCharacters formUnionWithCharacterSet:[NSCharacterSet punctuationCharacterSet]];
     NSArray *validComponents = [fileName componentsSeparatedByCharactersInSet:invalidCharacters];
     fileName = [validComponents componentsJoinedByString:@"_"];
-    
+
     if ((option & FBSnapshotTestCaseFileNameIncludeOptionScreenScale) == FBSnapshotTestCaseFileNameIncludeOptionScreenScale) {
         CGFloat screenScale = [[UIScreen mainScreen] scale];
         fileName = [fileName stringByAppendingFormat:@"@%.fx", screenScale];
diff --git a/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemoTests/FBSnapshotTestCaseDemoTests.m b/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemoTests/FBSnapshotTestCaseDemoTests.m
index e37338c..508be31 100644
--- a/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemoTests/FBSnapshotTestCaseDemoTests.m
+++ b/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemoTests/FBSnapshotTestCaseDemoTests.m
@@ -92,11 +92,4 @@ - (void)testViewSnapshotWithDifferentBackgroundColorPerArchitecture
     FBSnapshotVerifyView(view, nil);
 }
 
-- (void)testViewSnapshotRecordedOnlyFor64BitArchitecture
-{
-    UIView *greenView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
-    greenView.backgroundColor = [UIColor greenColor];
-    FBSnapshotVerifyView(greenView, nil);
-}
-
 @end
diff --git a/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemoTests/ReferenceImages_64/FBSnapshotTestCaseDemoTests/testViewSnapshotRecordedOnlyFor64BitArchitecture@2x.png b/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemoTests/ReferenceImages_64/FBSnapshotTestCaseDemoTests/testViewSnapshotRecordedOnlyFor64BitArchitecture@2x.png
deleted file mode 100644
index 9d8159b..0000000
Binary files a/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemoTests/ReferenceImages_64/FBSnapshotTestCaseDemoTests/testViewSnapshotRecordedOnlyFor64BitArchitecture@2x.png and /dev/null differ
diff --git a/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemoTests/ReferenceImages_64/FBSnapshotTestCaseDemoTests/testViewSnapshotRecordedOnlyFor64BitArchitecture@3x.png b/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemoTests/ReferenceImages_64/FBSnapshotTestCaseDemoTests/testViewSnapshotRecordedOnlyFor64BitArchitecture@3x.png
deleted file mode 100644
index 7cda2ab..0000000
Binary files a/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemoTests/ReferenceImages_64/FBSnapshotTestCaseDemoTests/testViewSnapshotRecordedOnlyFor64BitArchitecture@3x.png and /dev/null differ