diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
index 9794f49..cd856ff 100644
--- a/.github/workflows/spm.yml
+++ b/.github/workflows/spm.yml
@@ -42,5 +42,4 @@ jobs:
     - name: Initialize xcodebuild
       run: xcodebuild -list
     - name: iOS Unit Tests
-    # TODO(aashishpatil-g): Change from spmbuildonly to spm when unit tests are fixed.
-      run: scripts/third_party/travis/retry.sh scripts/build.sh FirebaseDataConnect ${{ matrix.target }} spmbuildonly
+      run: scripts/third_party/travis/retry.sh scripts/build.sh FirebaseDataConnect ${{ matrix.target }} spm
diff --git a/Package.swift b/Package.swift
index b9b07ad..e683f4c 100644
--- a/Package.swift
+++ b/Package.swift
@@ -50,13 +50,9 @@ let package = Package(
       path: "Sources"
     ),
     .testTarget(
-      name: "FirebaseDataConnectTests",
+      name: "FirebaseDataConnectUnit",
       dependencies: ["FirebaseDataConnect"],
-      path: "Tests",
-      exclude: ["Gen/KitchenSink/Package.swift"],
-      resources: [
-        .copy("Resources/fdc-kitchensink"),
-      ]
+      path: "Tests/Unit"
     ),
   ]
 )
diff --git a/Tests/Unit/TimestampCodaleTests.swift b/Tests/Unit/TimestampCodableTests.swift
similarity index 100%
rename from Tests/Unit/TimestampCodaleTests.swift
rename to Tests/Unit/TimestampCodableTests.swift