diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/AppEvents/SKAdNetwork/FBSDKSKAdNetworkConversionConfigurationTests.m b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/AppEvents/SKAdNetwork/FBSDKSKAdNetworkConversionConfigurationTests.m
index 0dfbabcc8f..4afd96586f 100644
--- a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/AppEvents/SKAdNetwork/FBSDKSKAdNetworkConversionConfigurationTests.m
+++ b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/AppEvents/SKAdNetwork/FBSDKSKAdNetworkConversionConfigurationTests.m
@@ -24,11 +24,7 @@
  #import "FBSDKSKAdNetworkConversionConfiguration.h"
  #import "FBSDKSKAdNetworkRule.h"
  #import "FBSDKTestCase.h"
- #if defined FBSDKCOCOAPODS || FBSDK_SWIFT_PACKAGE
-  #import "FBSDKCoreKit_Basics.h"
- #else
-  #import <FBSDKCoreKit_Basics/FBSDKCoreKit_Basics.h>
- #endif
+ #import "FBSDKTypeUtility.h"
 
 @interface FBSDKSKAdNetworkConversionConfiguration ()
 
diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/FBSDKJSONValueTests.m b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/FBSDKJSONValueTests.m
index 6be1d3a5f6..d12613e655 100644
--- a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/FBSDKJSONValueTests.m
+++ b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/FBSDKJSONValueTests.m
@@ -19,11 +19,7 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#if defined FBSDKCOCOAPODS || FBSDK_SWIFT_PACKAGE
- #import "FBSDKCoreKit_Basics.h"
-#else
- #import <FBSDKCoreKit_Basics/FBSDKCoreKit_Basics.h>
-#endif
+#import "FBSDKJSONValue.h"
 
 @interface FBSDKJSONValueTests : XCTestCase
 @end
diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/Helpers/UserDefaultsSpy.m b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/Helpers/UserDefaultsSpy.m
index 1d8f22c1fd..dafcfd2098 100644
--- a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/Helpers/UserDefaultsSpy.m
+++ b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/Helpers/UserDefaultsSpy.m
@@ -18,11 +18,7 @@
 
 #import "UserDefaultsSpy.h"
 
-#if defined FBSDKCOCOAPODS || FBSDK_SWIFT_PACKAGE
- #import "FBSDKCoreKit_Basics.h"
-#else
- #import <FBSDKCoreKit_Basics/FBSDKCoreKit_Basics.h>
-#endif
+#import "FBSDKTypeUtility.h"
 
 @implementation UserDefaultsSpy