diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 6919ab44..1635092e 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -2253,6 +2253,7 @@
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/MacPass.app/Contents/MacOS/MacPass";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				COMBINE_HIDPI_IMAGES = YES;
@@ -2276,6 +2277,7 @@
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/MacPass.app/Contents/MacOS/MacPass";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				COMBINE_HIDPI_IMAGES = YES;
diff --git a/MacPassTests/MPDatabaseLoading.m b/MacPassTests/MPDatabaseLoading.m
index ac6c4278..826b348d 100644
--- a/MacPassTests/MPDatabaseLoading.m
+++ b/MacPassTests/MPDatabaseLoading.m
@@ -9,7 +9,7 @@
 #import <XCTest/XCTest.h>
 
 #import "MPDocument.h"
-#import "KPKTree.h"
+#import "KeePassKit/KeePassKit.h"
 
 @interface MPDatabaseLoading : XCTestCase
 
@@ -19,7 +19,7 @@
 
 
 - (void)testLoadVersion1 {
-  NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+  NSBundle *myBundle = [NSBundle bundleForClass:[KPKTree class]];
   NSURL *url = [myBundle URLForResource:@"Test_Password_1234" withExtension:@"kdb"];
   NSError *error = nil;
   MPDocument *document = [[MPDocument alloc] initWithContentsOfURL:url ofType:@"kdb" error:&error];
@@ -33,7 +33,7 @@
 }
 
 - (void)testVersion1WrongPassword {
-  NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+  NSBundle *myBundle = [NSBundle bundleForClass:[KPKTree class]];
   NSURL *url = [myBundle URLForResource:@"Test_Password_1234" withExtension:@"kdb"];
   NSError *error = nil;
   MPDocument *document = [[MPDocument alloc] initWithContentsOfURL:url ofType:@"kdb" error:&error];
@@ -45,7 +45,7 @@
 }
 
 - (void)testLoadDatabaseVerions2 {
-  NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+  NSBundle *myBundle = [NSBundle bundleForClass:[KPKTree class]];
   NSURL *url = [myBundle URLForResource:@"Test_Password_1234" withExtension:@"kdbx"];
   NSError *error = nil;
   MPDocument *document = [[MPDocument alloc] initWithContentsOfURL:url ofType:@"kdbx" error:&error];
diff --git a/MacPassTests/MPDatabasePasswordAndKeyfile.m b/MacPassTests/MPDatabasePasswordAndKeyfile.m
index 81e64312..f36f3a43 100644
--- a/MacPassTests/MPDatabasePasswordAndKeyfile.m
+++ b/MacPassTests/MPDatabasePasswordAndKeyfile.m
@@ -10,7 +10,7 @@
 #import <XCTest/XCTest.h>
 
 #import "MPDocument.h"
-#import "KPKCompositeKey.h"
+#import "KeePassKit/KeePassKit.h"
 
 @interface MPDatabasePasswordAndKeyfile : XCTestCase {
   MPDocument *_database;
diff --git a/MacPassTests/MPDatabaseSearch.m b/MacPassTests/MPDatabaseSearch.m
index 5a4a6bda..d61f50ed 100644
--- a/MacPassTests/MPDatabaseSearch.m
+++ b/MacPassTests/MPDatabaseSearch.m
@@ -9,9 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import <XCTest/XCTest.h>
 
-#import "KPKTree.h"
-#import "KPKGroup.h"
-#import "KPKEntry.h"
+#import "KeePassKit/KeePassKit.h"
 
 @interface MPDatabaseSearch : XCTestCase
 
diff --git a/MacPassTests/MPTestAutotype.m b/MacPassTests/MPTestAutotype.m
index 9cf1b9c9..a8ba3ac4 100644
--- a/MacPassTests/MPTestAutotype.m
+++ b/MacPassTests/MPTestAutotype.m
@@ -17,10 +17,7 @@
 
 #import "MPKeyMapper.h"
 
-#import "KPKEntry.h"
-#import "KPKAttribute.h"
-#import "KPKAutotype.h"
-#import "KPKWindowAssociation.h"
+#import "KeePassKit/KeePassKit.h"
 
 @interface MPTestAutotype : XCTestCase
 @property (strong) KPKEntry *entry;
diff --git a/MacPassTests/MPTestDocument.m b/MacPassTests/MPTestDocument.m
index e7c63a19..3dbaee39 100644
--- a/MacPassTests/MPTestDocument.m
+++ b/MacPassTests/MPTestDocument.m
@@ -9,9 +9,7 @@
 #import <XCTest/XCTest.h>
 
 #import "MPDocument.h"
-#import "KPKTree.h"
-#import "KPKCompositeKey.h"
-
+#import "KeePassKit/KeePassKit.h"
 @interface MPTestDocument : XCTestCase
 
 @end