diff --git a/GoogleDataLogger.podspec b/GoogleDataLogger.podspec
index 65fc197ac40..7a9f776e9d3 100644
--- a/GoogleDataLogger.podspec
+++ b/GoogleDataLogger.podspec
@@ -35,7 +35,7 @@ Shared library for iOS SDK data logging needs.
   }
 
   # Test specs
-  s.test_spec 'Tests' do |test_spec|
-    test_spec.source_files = 'GoogleDataLogger/Tests/**/*.{h,m}'
+  s.test_spec 'UnitTests' do |test_spec|
+    test_spec.source_files = 'GoogleDataLogger/Tests/Unit/**/*.{h,m}'
   end
 end
diff --git a/GoogleDataLogger/Tests/Categories/GDLLogStorage+Testing.h b/GoogleDataLogger/Tests/Unit/Categories/GDLLogStorage+Testing.h
similarity index 100%
rename from GoogleDataLogger/Tests/Categories/GDLLogStorage+Testing.h
rename to GoogleDataLogger/Tests/Unit/Categories/GDLLogStorage+Testing.h
diff --git a/GoogleDataLogger/Tests/Categories/GDLLogStorage+Testing.m b/GoogleDataLogger/Tests/Unit/Categories/GDLLogStorage+Testing.m
similarity index 100%
rename from GoogleDataLogger/Tests/Categories/GDLLogStorage+Testing.m
rename to GoogleDataLogger/Tests/Unit/Categories/GDLLogStorage+Testing.m
diff --git a/GoogleDataLogger/Tests/Categories/GDLRegistrar+Testing.h b/GoogleDataLogger/Tests/Unit/Categories/GDLRegistrar+Testing.h
similarity index 100%
rename from GoogleDataLogger/Tests/Categories/GDLRegistrar+Testing.h
rename to GoogleDataLogger/Tests/Unit/Categories/GDLRegistrar+Testing.h
diff --git a/GoogleDataLogger/Tests/Categories/GDLRegistrar+Testing.m b/GoogleDataLogger/Tests/Unit/Categories/GDLRegistrar+Testing.m
similarity index 100%
rename from GoogleDataLogger/Tests/Categories/GDLRegistrar+Testing.m
rename to GoogleDataLogger/Tests/Unit/Categories/GDLRegistrar+Testing.m
diff --git a/GoogleDataLogger/Tests/Fakes/GDLLogStorageFake.h b/GoogleDataLogger/Tests/Unit/Fakes/GDLLogStorageFake.h
similarity index 100%
rename from GoogleDataLogger/Tests/Fakes/GDLLogStorageFake.h
rename to GoogleDataLogger/Tests/Unit/Fakes/GDLLogStorageFake.h
diff --git a/GoogleDataLogger/Tests/Fakes/GDLLogStorageFake.m b/GoogleDataLogger/Tests/Unit/Fakes/GDLLogStorageFake.m
similarity index 100%
rename from GoogleDataLogger/Tests/Fakes/GDLLogStorageFake.m
rename to GoogleDataLogger/Tests/Unit/Fakes/GDLLogStorageFake.m
diff --git a/GoogleDataLogger/Tests/Fakes/GDLLogWriterFake.h b/GoogleDataLogger/Tests/Unit/Fakes/GDLLogWriterFake.h
similarity index 100%
rename from GoogleDataLogger/Tests/Fakes/GDLLogWriterFake.h
rename to GoogleDataLogger/Tests/Unit/Fakes/GDLLogWriterFake.h
diff --git a/GoogleDataLogger/Tests/Fakes/GDLLogWriterFake.m b/GoogleDataLogger/Tests/Unit/Fakes/GDLLogWriterFake.m
similarity index 100%
rename from GoogleDataLogger/Tests/Fakes/GDLLogWriterFake.m
rename to GoogleDataLogger/Tests/Unit/Fakes/GDLLogWriterFake.m
diff --git a/GoogleDataLogger/Tests/Fakes/GDLUploaderFake.h b/GoogleDataLogger/Tests/Unit/Fakes/GDLUploaderFake.h
similarity index 100%
rename from GoogleDataLogger/Tests/Fakes/GDLUploaderFake.h
rename to GoogleDataLogger/Tests/Unit/Fakes/GDLUploaderFake.h
diff --git a/GoogleDataLogger/Tests/Fakes/GDLUploaderFake.m b/GoogleDataLogger/Tests/Unit/Fakes/GDLUploaderFake.m
similarity index 100%
rename from GoogleDataLogger/Tests/Fakes/GDLUploaderFake.m
rename to GoogleDataLogger/Tests/Unit/Fakes/GDLUploaderFake.m
diff --git a/GoogleDataLogger/Tests/GDLClockTest.m b/GoogleDataLogger/Tests/Unit/GDLClockTest.m
similarity index 100%
rename from GoogleDataLogger/Tests/GDLClockTest.m
rename to GoogleDataLogger/Tests/Unit/GDLClockTest.m
diff --git a/GoogleDataLogger/Tests/GDLLogEventTest.m b/GoogleDataLogger/Tests/Unit/GDLLogEventTest.m
similarity index 100%
rename from GoogleDataLogger/Tests/GDLLogEventTest.m
rename to GoogleDataLogger/Tests/Unit/GDLLogEventTest.m
diff --git a/GoogleDataLogger/Tests/GDLLogStorageTest.m b/GoogleDataLogger/Tests/Unit/GDLLogStorageTest.m
similarity index 99%
rename from GoogleDataLogger/Tests/GDLLogStorageTest.m
rename to GoogleDataLogger/Tests/Unit/GDLLogStorageTest.m
index 47df570bbe9..efe7ea87ad9 100644
--- a/GoogleDataLogger/Tests/GDLLogStorageTest.m
+++ b/GoogleDataLogger/Tests/Unit/GDLLogStorageTest.m
@@ -42,6 +42,7 @@ @interface GDLLogStorageTest : GDLTestCase
 /** The test prioritizer implementation. */
 @property(nullable, nonatomic) GDLTestPrioritizer *testPrioritizer;
 
+/** The uploader fake. */
 @property(nonatomic) GDLUploaderFake *uploaderFake;
 
 @end
diff --git a/GoogleDataLogger/Tests/GDLLogUploaderTest.m b/GoogleDataLogger/Tests/Unit/GDLLogUploaderTest.m
similarity index 100%
rename from GoogleDataLogger/Tests/GDLLogUploaderTest.m
rename to GoogleDataLogger/Tests/Unit/GDLLogUploaderTest.m
diff --git a/GoogleDataLogger/Tests/GDLLogWriterTest.m b/GoogleDataLogger/Tests/Unit/GDLLogWriterTest.m
similarity index 100%
rename from GoogleDataLogger/Tests/GDLLogWriterTest.m
rename to GoogleDataLogger/Tests/Unit/GDLLogWriterTest.m
diff --git a/GoogleDataLogger/Tests/GDLLoggerTest.m b/GoogleDataLogger/Tests/Unit/GDLLoggerTest.m
similarity index 100%
rename from GoogleDataLogger/Tests/GDLLoggerTest.m
rename to GoogleDataLogger/Tests/Unit/GDLLoggerTest.m
diff --git a/GoogleDataLogger/Tests/GDLRegistrarTest.m b/GoogleDataLogger/Tests/Unit/GDLRegistrarTest.m
similarity index 100%
rename from GoogleDataLogger/Tests/GDLRegistrarTest.m
rename to GoogleDataLogger/Tests/Unit/GDLRegistrarTest.m
diff --git a/GoogleDataLogger/Tests/GDLTestCase.h b/GoogleDataLogger/Tests/Unit/GDLTestCase.h
similarity index 100%
rename from GoogleDataLogger/Tests/GDLTestCase.h
rename to GoogleDataLogger/Tests/Unit/GDLTestCase.h
diff --git a/GoogleDataLogger/Tests/GDLTestCase.m b/GoogleDataLogger/Tests/Unit/GDLTestCase.m
similarity index 100%
rename from GoogleDataLogger/Tests/GDLTestCase.m
rename to GoogleDataLogger/Tests/Unit/GDLTestCase.m
diff --git a/GoogleDataLogger/Tests/Helpers/GDLAssertHelper.h b/GoogleDataLogger/Tests/Unit/Helpers/GDLAssertHelper.h
similarity index 100%
rename from GoogleDataLogger/Tests/Helpers/GDLAssertHelper.h
rename to GoogleDataLogger/Tests/Unit/Helpers/GDLAssertHelper.h
diff --git a/GoogleDataLogger/Tests/Helpers/GDLAssertHelper.m b/GoogleDataLogger/Tests/Unit/Helpers/GDLAssertHelper.m
similarity index 100%
rename from GoogleDataLogger/Tests/Helpers/GDLAssertHelper.m
rename to GoogleDataLogger/Tests/Unit/Helpers/GDLAssertHelper.m
diff --git a/GoogleDataLogger/Tests/Helpers/GDLLogExtensionTesterClasses.h b/GoogleDataLogger/Tests/Unit/Helpers/GDLLogExtensionTesterClasses.h
similarity index 100%
rename from GoogleDataLogger/Tests/Helpers/GDLLogExtensionTesterClasses.h
rename to GoogleDataLogger/Tests/Unit/Helpers/GDLLogExtensionTesterClasses.h
diff --git a/GoogleDataLogger/Tests/Helpers/GDLLogExtensionTesterClasses.m b/GoogleDataLogger/Tests/Unit/Helpers/GDLLogExtensionTesterClasses.m
similarity index 100%
rename from GoogleDataLogger/Tests/Helpers/GDLLogExtensionTesterClasses.m
rename to GoogleDataLogger/Tests/Unit/Helpers/GDLLogExtensionTesterClasses.m
diff --git a/GoogleDataLogger/Tests/Helpers/GDLTestBackend.h b/GoogleDataLogger/Tests/Unit/Helpers/GDLTestBackend.h
similarity index 100%
rename from GoogleDataLogger/Tests/Helpers/GDLTestBackend.h
rename to GoogleDataLogger/Tests/Unit/Helpers/GDLTestBackend.h
diff --git a/GoogleDataLogger/Tests/Helpers/GDLTestBackend.m b/GoogleDataLogger/Tests/Unit/Helpers/GDLTestBackend.m
similarity index 100%
rename from GoogleDataLogger/Tests/Helpers/GDLTestBackend.m
rename to GoogleDataLogger/Tests/Unit/Helpers/GDLTestBackend.m
diff --git a/GoogleDataLogger/Tests/Helpers/GDLTestPrioritizer.h b/GoogleDataLogger/Tests/Unit/Helpers/GDLTestPrioritizer.h
similarity index 100%
rename from GoogleDataLogger/Tests/Helpers/GDLTestPrioritizer.h
rename to GoogleDataLogger/Tests/Unit/Helpers/GDLTestPrioritizer.h
diff --git a/GoogleDataLogger/Tests/Helpers/GDLTestPrioritizer.m b/GoogleDataLogger/Tests/Unit/Helpers/GDLTestPrioritizer.m
similarity index 100%
rename from GoogleDataLogger/Tests/Helpers/GDLTestPrioritizer.m
rename to GoogleDataLogger/Tests/Unit/Helpers/GDLTestPrioritizer.m