diff --git a/.travis.yml b/.travis.yml
index 1949ca7..e64909c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,36 @@
-sudo: required
-services:
-  - docker
-before_install:
-  - docker pull yglukhov/nim-base
-script:
-  - docker run yglukhov/nim-base nim --version
-  - docker run -v "$(pwd):/project" -w /project yglukhov/nim-base sh -c "nimble install -dy && nimble test"
+matrix:
+  # allow_failures:
+  #   - os: osx
+
+  include:
+    - os: linux
+      sudo: required
+      services:
+        - docker
+      before_install:
+        - docker pull statusteam/nim-base
+      script:
+        - docker run statusteam/nim-base nim --version
+        - docker run -v "$(pwd):/project" -w /project statusteam/nim-base sh -c "nimble install -dy && nimble test"
+
+    - os: osx
+      before_install:
+        - git clone https://github.com/nim-lang/nim.git
+        - cd nim
+        - git remote add statusim https://github.com/status-im/nim.git
+        - git fetch statusim
+        - git config --global user.email "you@example.com"
+        - git config --global user.name "Your Name"
+        - for b in $(git branch -a --list 'statusim/status-autopatch-*'); do git merge $b; done
+        - git clone --depth 1 https://github.com/nim-lang/csources.git
+        - cd csources
+        - sh build.sh
+        - cd ..
+        - export PATH=$PWD/bin:$PATH
+        - nim c koch
+        - ./koch boot -d:release
+        - ./koch nimble
+        - cd ..
+
+      script:
+        - nimble install -dy && nimble test