diff --git a/.travis.sh b/.travis.sh
index 2a9e1f213..c2feb71f2 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -46,7 +46,7 @@ function build ()
   cmake $SOURCE_DIR \
       -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
       -DGTSAM_BUILD_TESTS=OFF \
-      -DGTSAM_BUILD_UNSTABLE=ON \
+      -DGTSAM_BUILD_UNSTABLE=$GTSAM_BUILD_UNSTABLE \
       -DGTSAM_BUILD_EXAMPLES_ALWAYS=ON \
       -DGTSAM_ALLOW_DEPRECATED_SINCE_V4=$GTSAM_ALLOW_DEPRECATED_SINCE_V4
 
@@ -64,7 +64,7 @@ function test ()
   cmake $SOURCE_DIR \
       -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
       -DGTSAM_BUILD_TESTS=ON \
-      -DGTSAM_BUILD_UNSTABLE=ON \
+      -DGTSAM_BUILD_UNSTABLE=$GTSAM_BUILD_UNSTABLE \
       -DGTSAM_BUILD_EXAMPLES_ALWAYS=OFF \
       -DGTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF
 
diff --git a/.travis.yml b/.travis.yml
index 54177fc09..b2d44a9cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ jobs:
   - stage: compile
     os: osx
     compiler: gcc
-    env: CMAKE_BUILD_TYPE=Debug
+    env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF
     script: bash .travis.sh -b
   - stage: compile
     os: osx
@@ -46,7 +46,7 @@ jobs:
   - stage: compile
     os: osx
     compiler: clang
-    env: CMAKE_BUILD_TYPE=Debug
+    env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF
     script: bash .travis.sh -b
   - stage: compile
     os: osx
@@ -57,7 +57,7 @@ jobs:
   - stage: compile
     os: linux
     compiler: gcc
-    env: CMAKE_BUILD_TYPE=Debug
+    env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF
     script: bash .travis.sh -b
   - stage: compile
     os: linux
@@ -68,7 +68,7 @@ jobs:
   - stage: compile
     os: linux
     compiler: clang
-    env: CMAKE_BUILD_TYPE=Debug
+    env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF
     script: bash .travis.sh -b
   - stage: compile
     os: linux
@@ -79,7 +79,7 @@ jobs:
   - stage: compile
     os: linux
     compiler: clang
-    env: CMAKE_BUILD_TYPE=Debug GTSAM_ALLOW_DEPRECATED_SINCE_V4=ON
+    env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF GTSAM_ALLOW_DEPRECATED_SINCE_V4=ON
     script: bash .travis.sh -b
 
 # Matrix configuration:
@@ -94,8 +94,9 @@ env:
     - MAKEFLAGS="-j2"
     - CCACHE_SLOPPINESS=pch_defines,time_macros
     - GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF
+    - GTSAM_BUILD_UNSTABLE=ON
   matrix:
-    - CMAKE_BUILD_TYPE=Debug
+    - CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF
     - CMAKE_BUILD_TYPE=Release
 script:
   - bash .travis.sh -t