diff --git a/.travis.yml b/.travis.yml
index f5cc644147..691fc4fc1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,20 @@
 language: rust
+os:
+  - linux
+  - osx
 rust:
-- stable
-- nightly
+  - stable
+  - nightly
+matrix:
+  include:
+    - rust: stable
+      env: FEATURE=with-syntex
+    - rust: nightly
+      env: FEATURE=nightly
+  allow_failures:
+    - os: osx
 script:
-  - make docs-all gen-all-cli cargo-api ARGS=test
+  - make docs-all gen-all-cli cargo-api ARGS="test --no-default-features --features=$FEATURE"
   - if [[ $TRAVIS_RUST_VERSION = nightly ]]; then cargo test; fi
 env:
   global:
diff --git a/src/mako/Cargo.toml.mako b/src/mako/Cargo.toml.mako
index ca9356f620..620a96fda4 100644
--- a/src/mako/Cargo.toml.mako
+++ b/src/mako/Cargo.toml.mako
@@ -31,15 +31,16 @@ hyper = "^ 0.9"
 mime = "^ 0.2.0"
 serde = "^ 0.7.5"
 serde_json = "^ 0.7.0"
+yup-oauth2 = { version = "^ 0.6.0", optional = true, default-features = false }
 serde_macros = { version = "0.7.5", optional = true }
 % for dep in cargo.get('dependencies', list()):
 ${dep}
 % endfor
 
 [features]
-default = ["with_syntex"]
-nightly = ["serde_macros"]
-with_syntex = ["serde_codegen", "syntex"]
+default = ["with-syntex"]
+nightly = ["serde_macros", "yup-oauth2/nightly"]
+with-syntex = ["serde_codegen", "syntex", "yup-oauth2/with-syntex"]
 
 [build-dependencies]
 syntex = { version = "= 0.32", optional = true }
diff --git a/src/mako/api/build.rs.mako b/src/mako/api/build.rs.mako
index 2370106974..b217200059 100644
--- a/src/mako/api/build.rs.mako
+++ b/src/mako/api/build.rs.mako
@@ -1,5 +1,5 @@
 <%namespace name="util" file="../lib/util.mako"/>\
-#[cfg(feature = "with_syntex")]
+#[cfg(feature = "with-syntex")]
 mod inner {
     extern crate syntex;
     extern crate serde_codegen;
@@ -19,7 +19,7 @@ mod inner {
     }
 }
 
-#[cfg(not(feature = "with_syntex"))]
+#[cfg(not(feature = "with-syntex"))]
 mod inner {
     pub fn main() {}
 }
diff --git a/src/mako/api/lib.rs.mako b/src/mako/api/lib.rs.mako
index a62cfba078..6911ce9d2f 100644
--- a/src/mako/api/lib.rs.mako
+++ b/src/mako/api/lib.rs.mako
@@ -24,5 +24,5 @@ ${lib.docs(c)}
 #[cfg(feature = "nightly")]
 include!("lib.rs.in");
 
-#[cfg(feature = "with_syntex")]
+#[cfg(feature = "with-syntex")]
 include!(concat!(env!("OUT_DIR"), "/lib.rs"));
\ No newline at end of file