diff --git a/.travis.yml b/.travis.yml
index 71875d79c..e08146656 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,50 @@
 language: c
 sudo: false
 
+os:
+  - linux
+  - osx
+
 compiler:
   - gcc
 
 env:
-  - RUN_TEST=1 BUILD_CONFIG="auto"
-  - RUN_TEST=1 BUILD_CONFIG="reference"
-  - RUN_TEST=1 BUILD_CONFIG="dunnington"
-  - RUN_TEST=0 BUILD_CONFIG="sandybridge"
-  - RUN_TEST=0 BUILD_CONFIG="haswell"
-  - RUN_TEST=0 BUILD_CONFIG="bulldozer"
-  - RUN_TEST=0 BUILD_CONFIG="piledriver"
-  - RUN_TEST=0 BUILD_CONFIG="carrizo"
+  - RUN_TEST=1 THREADING="none" BUILD_CONFIG="auto"
+  - RUN_TEST=1 THREADING="none" BUILD_CONFIG="reference"
+  - RUN_TEST=1 THREADING="none" BUILD_CONFIG="dunnington"
+  - RUN_TEST=0 THREADING="none" BUILD_CONFIG="sandybridge"
+  - RUN_TEST=0 THREADING="none" BUILD_CONFIG="knl"
+  - RUN_TEST=0 THREADING="none" BUILD_CONFIG="haswell"
+  - RUN_TEST=0 THREADING="none" BUILD_CONFIG="bulldozer"
+  - RUN_TEST=0 THREADING="none" BUILD_CONFIG="piledriver"
+  - RUN_TEST=0 THREADING="none" BUILD_CONFIG="carrizo"
+  - RUN_TEST=1 THREADING="openmp" BUILD_CONFIG="auto"
+  - RUN_TEST=1 THREADING="pthreads" BUILD_CONFIG="auto"
+  
+matrix:
+  exclude:
+    - os: osx
+      env: RUN_TEST=1 THREADING="none" BUILD_CONFIG="reference"
+    - os: osx
+      env: RUN_TEST=1 THREADING="none" BUILD_CONFIG="dunnington"
+    - os: osx
+      env: RUN_TEST=0 THREADING="none" BUILD_CONFIG="sandybridge"
+    - os: osx
+      env: RUN_TEST=0 THREADING="none" BUILD_CONFIG="knl"
+    - os: osx
+      env: RUN_TEST=0 THREADING="none" BUILD_CONFIG="haswell"
+    - os: osx
+      env: RUN_TEST=0 THREADING="none" BUILD_CONFIG="bulldozer"
+    - os: osx
+      env: RUN_TEST=0 THREADING="none" BUILD_CONFIG="piledriver"
+    - os: osx
+      env: RUN_TEST=0 THREADING="none" BUILD_CONFIG="carrizo"
+    - os: osx
+      env: RUN_TEST=1 THREADING="openmp" BUILD_CONFIG="auto"
 
 install:
-- if [ "$CC" = "gcc" ]; then export CC="gcc-4.9"; fi
+  - if [ "$CC" = "gcc" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CC="gcc-4.9"; fi
+
 addons:
   apt:
     sources:
@@ -23,11 +52,14 @@ addons:
     packages:
     - gcc-4.9
     - clang
-
-
-
+    
 script:
-  - ./configure $BUILD_CONFIG
-  - make CC=gcc-4.9
+  - ./configure -t $THREADING $BUILD_CONFIG
+  - $CC --version
+  - make -j 4
+  - export BLIS_IC_NT=2
+  - export BLIS_JC_NT=1
+  - export BLIS_IR_NT=1
+  - export BLIS_JR_NT=2
   - if [ $RUN_TEST -eq 1 ]; then make BLIS_ENABLE_TEST_OUTPUT=yes test; fi
   - if [ $RUN_TEST -eq 1 ]; then ./build/check-test.sh ./output.testsuite; fi