diff --git a/.circleci/config.yml b/.circleci/config.yml
index 53d444c8..9aa86946 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,10 +3,7 @@
 # Check https://circleci.com/docs/2.0/language-java/ for more details
 #
 version: 2
-orbs:
-  gradle: circleci/gradle@2.2.0
-  win: circleci/windows@2.2.0
-jobs:
+jobs:      
   test_linux:
     docker:
       - image: mingc/android-build-box
@@ -17,20 +14,10 @@ jobs:
 
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "build.gradle.kts" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-      - run: gradle dependencies
-      - save_cache:
-          paths:
-            - ~/.gradle
-          key: v1-dependencies-{{ checksum "build.gradle.kts" }}
-      - run: gradle linuxX64Test
-  test_js:
+      - run: ./gradlew linuxX64Test
+  test_jvm:
     docker:
-      - image: mingc/android-build-box
+      - image: circleci/openjdk:11-jdk
     working_directory: ~/repo
     environment:
       JVM_OPTS: -Xmx3200m
@@ -38,20 +25,10 @@ jobs:
 
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "build.gradle.kts" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-      - run: gradle dependencies
-      - save_cache:
-          paths:
-            - ~/.gradle
-          key: v1-dependencies-{{ checksum "build.gradle.kts" }}
-      - run: gradle jsIrTest jsLegacyTest
-  test_jvm:
+      - run: ./gradlew jvmTest
+  test_android:
     docker:
-      - image: circleci/openjdk:11-jdk
+      - image: mingc/android-build-box
     working_directory: ~/repo
     environment:
       JVM_OPTS: -Xmx3200m
@@ -59,22 +36,11 @@ jobs:
 
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "build.gradle.kts" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-      - run: gradle dependencies
-      - save_cache:
-          paths:
-            - ~/.gradle
-          key: v1-dependencies-{{ checksum "build.gradle.kts" }}
-      - run: gradle jvmTest
-
+      - run: ./gradlew testDebugUnitTest
 workflows:
  version: 2
  run_tests:
    jobs:
      - test_jvm
-     - test_js
      - test_linux
+     - test_android