diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5cea17bedac..bd2004e9215 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,22 +17,23 @@ jobs:
       tag: 2023.07.1
 
     steps:
-      # Checkout the code as the first step.
       - checkout
+
       - android/change-java-version:
           java-version: 17
-      # The next step will run the unit tests
+
+      - android/start-emulator-and-run-tests:
+          system-image: system-images;android-29;google_apis;x86
+          # Compile while the emulator starts to use the time.
+          post-emulator-launch-assemble-command: ./gradlew compileFullDebugUnitTestSources database:impl:compileFullDebugAndroidTestSources
+          test-command: ./gradlew database:impl:connectedFullDebugAndroidTest
+
       - android/run-tests:
           test-command: ./gradlew testFullDebugUnitTest
 
       - android/run-tests:
           test-command: ./gradlew --stacktrace jacocoAllDebugReport
 
-      # Then start the emulator and run the Instrumentation tests!
-      #      - android/start-emulator-and-run-tests:
-      #          test-command: ./gradlew connectedDebugAndroidTest
-      #          system-image: system-images;android-25;google_apis;x86
-
       # And finally run the release build
       #      - run:
       #          name: Assemble release build