diff --git a/Tests/Logic/Network/RKResponseDescriptorTest.m b/Tests/Logic/Network/RKResponseDescriptorTest.m
index 798c869c..e72e6665 100644
--- a/Tests/Logic/Network/RKResponseDescriptorTest.m
+++ b/Tests/Logic/Network/RKResponseDescriptorTest.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2012 RestKit. All rights reserved.
 //
 
+#import "Kiwi.h"
 #import "RKTestEnvironment.h"
 #import "RKTestUser.h"
-#import "Kiwi.h"
 
 SPEC_BEGIN(RKResponseDescriptorSpec)
 
diff --git a/Tests/RKTestEnvironment.h b/Tests/RKTestEnvironment.h
index a094b55e..d22e411f 100644
--- a/Tests/RKTestEnvironment.h
+++ b/Tests/RKTestEnvironment.h
@@ -18,19 +18,21 @@
 //  limitations under the License.
 //
 
+#import <SenTestingKit/SenTestingKit.h>
 #import <OCMock/OCMock.h>
 #import <OCMock/NSNotificationCenter+OCMAdditions.h>
 
-#define HC_SHORTHAND
-#import "OCHamcrest.h"
-#import <SenTestingKit/SenTestingKit.h>
+// If Kiwi has been imported, skip Hamcrest
+#ifndef KW_VERSION
+    #define HC_SHORTHAND
+    #import "OCHamcrest.h"
+#endif
 
 #define EXP_SHORTHAND
 #import "Expecta.h"
 
-#import "RestKit.h"
+#import <RestKit/RestKit.h>
 #import <RestKit/Testing.h>
-#import <RestKit/RKManagedObjectStore.h>
 
 /*
  Base class for RestKit test cases. Provides initialization of testing