diff --git a/.circleci/config.yml b/.circleci/config.yml
index e70614c1b1..8bc100203f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -133,6 +133,11 @@ jobs:
             command: |
               cd apps/remixdesktop/
               ./run_ci_test.sh
+        - run:  
+            name: "Run isogit tests"
+            command: |
+              cd apps/remixdesktop/
+              ./run_git_ui_isogit_tests.sh
         - store_test_results:
             path: ./apps/remixdesktop/reports/tests
         - store_artifacts:
diff --git a/apps/remixdesktop/run_git_ui_isogit_tests.sh b/apps/remixdesktop/run_git_ui_isogit_tests.sh
index 9333aa2498..d47be23523 100755
--- a/apps/remixdesktop/run_git_ui_isogit_tests.sh
+++ b/apps/remixdesktop/run_git_ui_isogit_tests.sh
@@ -1,6 +1,14 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -e
+TEST_EXITCODE=0
+yarn run build:e2e && node ./splice_tests.js
+TESTFILES=$(node ./splice_tests.js | grep -i 'git' | circleci tests split --split-by=timings)
+for TESTFILE in $TESTFILES; do
+    yarn run test --useIsoGit --test ./build-e2e/remixdesktop/test/tests/app/${TESTFILE} || TEST_EXITCODE=1
+done
 
-for testfile in build-e2e/remixdesktop/test/tests/app/git*.js
-do
-  yarn test:isogit --test $testfile
-done
\ No newline at end of file
+echo "$TEST_EXITCODE"
+if [ "$TEST_EXITCODE" -eq 1 ]
+then
+  exit 1
+fi