diff --git a/SwiftyJSON.xcodeproj/project.pbxproj b/SwiftyJSON.xcodeproj/project.pbxproj
index d940cb1e..4bddfa14 100644
--- a/SwiftyJSON.xcodeproj/project.pbxproj
+++ b/SwiftyJSON.xcodeproj/project.pbxproj
@@ -183,7 +183,7 @@
 			isa = PBXGroup;
 			children = (
 				2E4FEFDD19575BE100351305 /* Source */,
-				2E4FEFEA19575BE100351305 /* Tests */,
+				2E4FEFEA19575BE100351305 /* SwiftyJSONTests */,
 				2E4FEFDC19575BE100351305 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -223,7 +223,7 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		2E4FEFEA19575BE100351305 /* Tests */ = {
+		2E4FEFEA19575BE100351305 /* SwiftyJSONTests */ = {
 			isa = PBXGroup;
 			children = (
 				A885D1DA19CFCFF0002FD4C3 /* Tests.json */,
@@ -243,7 +243,8 @@
 				A8B66C8D19E52F4200540692 /* ArrayTests.swift */,
 				2E4FEFEB19575BE100351305 /* Supporting Files */,
 			);
-			path = Tests;
+			name = SwiftyJSONTests;
+			path = Tests/SwiftyJSONTests;
 			sourceTree = "<group>";
 		};
 		2E4FEFEB19575BE100351305 /* Supporting Files */ = {
@@ -804,7 +805,7 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = "Tests/Info-iOS.plist";
+				INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-iOS.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				METAL_ENABLE_DEBUG_INFO = YES;
@@ -818,7 +819,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				DEVELOPMENT_TEAM = "";
-				INFOPLIST_FILE = "Tests/Info-iOS.plist";
+				INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-iOS.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				METAL_ENABLE_DEBUG_INFO = NO;
@@ -938,7 +939,7 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = "Tests/Info-OSX.plist";
+				INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-OSX.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
@@ -955,7 +956,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = "";
-				INFOPLIST_FILE = "Tests/Info-OSX.plist";
+				INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-OSX.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
@@ -971,7 +972,7 @@
 				CODE_SIGN_IDENTITY = "";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Tests/Info-tvOS.plist";
+				INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-tvOS.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.tangplin.SwiftyJSON-tvOS-Tests";
@@ -988,7 +989,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Tests/Info-tvOS.plist";
+				INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-tvOS.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.tangplin.SwiftyJSON-tvOS-Tests";
diff --git a/Tests/ArrayTests.swift b/Tests/SwiftyJSONTests/ArrayTests.swift
similarity index 100%
rename from Tests/ArrayTests.swift
rename to Tests/SwiftyJSONTests/ArrayTests.swift
diff --git a/Tests/BaseTests.swift b/Tests/SwiftyJSONTests/BaseTests.swift
similarity index 100%
rename from Tests/BaseTests.swift
rename to Tests/SwiftyJSONTests/BaseTests.swift
diff --git a/Tests/ComparableTests.swift b/Tests/SwiftyJSONTests/ComparableTests.swift
similarity index 100%
rename from Tests/ComparableTests.swift
rename to Tests/SwiftyJSONTests/ComparableTests.swift
diff --git a/Tests/DictionaryTests.swift b/Tests/SwiftyJSONTests/DictionaryTests.swift
similarity index 100%
rename from Tests/DictionaryTests.swift
rename to Tests/SwiftyJSONTests/DictionaryTests.swift
diff --git a/Tests/Info-OSX.plist b/Tests/SwiftyJSONTests/Info-OSX.plist
similarity index 100%
rename from Tests/Info-OSX.plist
rename to Tests/SwiftyJSONTests/Info-OSX.plist
diff --git a/Tests/Info-iOS.plist b/Tests/SwiftyJSONTests/Info-iOS.plist
similarity index 100%
rename from Tests/Info-iOS.plist
rename to Tests/SwiftyJSONTests/Info-iOS.plist
diff --git a/Tests/Info-tvOS.plist b/Tests/SwiftyJSONTests/Info-tvOS.plist
similarity index 100%
rename from Tests/Info-tvOS.plist
rename to Tests/SwiftyJSONTests/Info-tvOS.plist
diff --git a/Tests/LiteralConvertibleTests.swift b/Tests/SwiftyJSONTests/LiteralConvertibleTests.swift
similarity index 100%
rename from Tests/LiteralConvertibleTests.swift
rename to Tests/SwiftyJSONTests/LiteralConvertibleTests.swift
diff --git a/Tests/NestedJSONTests.swift b/Tests/SwiftyJSONTests/NestedJSONTests.swift
similarity index 100%
rename from Tests/NestedJSONTests.swift
rename to Tests/SwiftyJSONTests/NestedJSONTests.swift
diff --git a/Tests/NumberTests.swift b/Tests/SwiftyJSONTests/NumberTests.swift
similarity index 100%
rename from Tests/NumberTests.swift
rename to Tests/SwiftyJSONTests/NumberTests.swift
diff --git a/Tests/PerformanceTests.swift b/Tests/SwiftyJSONTests/PerformanceTests.swift
similarity index 100%
rename from Tests/PerformanceTests.swift
rename to Tests/SwiftyJSONTests/PerformanceTests.swift
diff --git a/Tests/PrintableTests.swift b/Tests/SwiftyJSONTests/PrintableTests.swift
similarity index 100%
rename from Tests/PrintableTests.swift
rename to Tests/SwiftyJSONTests/PrintableTests.swift
diff --git a/Tests/RawRepresentableTests.swift b/Tests/SwiftyJSONTests/RawRepresentableTests.swift
similarity index 100%
rename from Tests/RawRepresentableTests.swift
rename to Tests/SwiftyJSONTests/RawRepresentableTests.swift
diff --git a/Tests/RawTests.swift b/Tests/SwiftyJSONTests/RawTests.swift
similarity index 100%
rename from Tests/RawTests.swift
rename to Tests/SwiftyJSONTests/RawTests.swift
diff --git a/Tests/SequenceTypeTests.swift b/Tests/SwiftyJSONTests/SequenceTypeTests.swift
similarity index 100%
rename from Tests/SequenceTypeTests.swift
rename to Tests/SwiftyJSONTests/SequenceTypeTests.swift
diff --git a/Tests/StringTests.swift b/Tests/SwiftyJSONTests/StringTests.swift
similarity index 100%
rename from Tests/StringTests.swift
rename to Tests/SwiftyJSONTests/StringTests.swift
diff --git a/Tests/SubscriptTests.swift b/Tests/SwiftyJSONTests/SubscriptTests.swift
similarity index 100%
rename from Tests/SubscriptTests.swift
rename to Tests/SwiftyJSONTests/SubscriptTests.swift
diff --git a/Tests/Tests.json b/Tests/SwiftyJSONTests/Tests.json
similarity index 100%
rename from Tests/Tests.json
rename to Tests/SwiftyJSONTests/Tests.json