diff --git a/.travis.yml b/.travis.yml
index 34334c322..ceef292b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,15 +15,18 @@ jobs:
       - make lint
       - make vendor-check
   - stage: Test unit and integration
-    script: make test-unit-coverage
+    script:
+      - make test-unit-race
+      - make test-unit-coverage
   - stage: Test e2e on private network
-    script: make test-e2e
+    script:
+      - make test-e2e-race
   - stage: Test e2e on public network
     # Disable running this stage for pushes as it's not needed to run it twice.
     # We only want to check if tests on public testnet pass in a merge build.
     # Also, disable for fork builds as they do not have access to
     # ACCOUNT_PASSWORD environment variable anyway.
-    if: (type != push) AND (fork = false)
+    if: ((type != push) OR (branch = "develop")) AND (fork = false)
     script:
       # Sync the chain first. It will time out after 30 minutes. Used network: Rinkeby.
       - make statusgo