diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6ac6ba7..a8637a4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
       # Android the primary container
       - image: circleci/android:api-25
     environment:
-      JVM_OPTS: -Xmx3200m
+      JVM_OPTS: -Xmx1024m
     steps:
       - checkout
       - restore_cache:
@@ -33,24 +33,6 @@ jobs:
       - store_test_results:
           path: app/build/test-results
           destination: test-results
-      - run:
-          name: Setup emulator
-          command: sdkmanager "system-images;android-21;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-21;default;armeabi-v7a"
-      - run:
-          name: Launch emulator
-          command: export LD_LIBRARY_PATH=${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib && emulator64-arm -avd test -noaudio -no-boot-anim -no-window -accel auto -verbose
-          background: true
-      - run:
-          name: Wait emulator
-          command: |
-            # wait for it to have booted
-            circle-android wait-for-boot
-            # unlock the emulator screen
-            sleep 60
-            adb shell input keyevent 82
-      - run:
-          name: Run EspressoTests
-          command: ./gradlew connectedDebugAndroidTest
       - store_artifacts:
           path: app/build/reports
           destination: reports
diff --git a/README.md b/README.md
index 742b481..9b8228c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 [ ![Download](https://api.bintray.com/packages/st235/maven/expandablebottombar/images/download.svg) ](https://bintray.com/st235/maven/expandablebottombar/_latestVersion)
 ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/st235/ExpandableBottomBar.svg)
-[![Build Status](https://travis-ci.com/st235/ExpandableBottomBar.svg?branch=master)](https://travis-ci.com/st235/ExpandableBottomBar)
+[![CircleCI](https://circleci.com/gh/st235/ExpandableBottomBar.svg?style=svg)](https://circleci.com/gh/st235/ExpandableBottomBar)
 
 A new way to improve navigation in your app