diff --git a/.travis.yml b/.travis.yml
index 4dd55c86ef..ba5ec867c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ rust:
   - stable
 
 env:
-  - CARGO_TARGET_DIR=/tmp/bindgen LLVM_VERSION=3.8 BINDGEN_FEATURES=llvm_stable
+  - CARGO_TARGET_DIR=/tmp/bindgen LLVM_VERSION=3.8 BINDGEN_FEATURES=testing_only_llvm_stable
   - CARGO_TARGET_DIR=/tmp/bindgen LLVM_VERSION=3.9 BINDGEN_FEATURES=
 
 cache:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9ee1b4ac33..cbaaf3c4ee 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -69,7 +69,7 @@ that you aren't forgetting to document types and functions. CI will catch it if
 you forget, but the turn around will be a lot slower ;)
 
 ```
-$ cargo build --features "llvm_stable _docs"
+$ cargo build --features docs_
 ```
 
 ## Testing
@@ -90,7 +90,7 @@ Run `cargo test` to compare generated Rust bindings to the expectations.
 ### Running All Tests
 
 ```
-$ cargo test [--features llvm_stable]
+$ cargo test [--all-features]
 ```
 
 ### Authoring New Tests
diff --git a/Cargo.toml b/Cargo.toml
index d108c2c9ad..9ac60ed0b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,7 +66,7 @@ version = "0.29"
 [features]
 assert_no_dangling_items = []
 default = ["logging"]
-llvm_stable = []
+testing_only_llvm_stable = []
 logging = ["env_logger", "log"]
 static = []
 # This feature only exists for CI -- don't use it!
diff --git a/bindgen-integration/Cargo.toml b/bindgen-integration/Cargo.toml
index 9b8e341d7b..3b1083d4e3 100644
--- a/bindgen-integration/Cargo.toml
+++ b/bindgen-integration/Cargo.toml
@@ -11,4 +11,4 @@ bindgen = { path = ".." }
 gcc = "0.3"
 
 [features]
-llvm_stable = ["bindgen/llvm_stable"]
+testing_only_llvm_stable = ["bindgen/testing_only_llvm_stable"]
diff --git a/src/main.rs b/src/main.rs
index 68f3d0a865..ea3da06d4d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,7 +25,7 @@ pub fn main() {
     let bind_args: Vec<_> = env::args().collect();
 
     let version = clang_version();
-    let expected_version = if cfg!(feature = "llvm_stable") {
+    let expected_version = if cfg!(feature = "testing_only_llvm_stable") {
         (3, 8)
     } else {
         (3, 9)
diff --git a/tests/tests.rs b/tests/tests.rs
index ab1c00c3de..6b69e0d42c 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -84,7 +84,7 @@ fn create_bindgen_builder(header: &PathBuf) -> Result<Option<Builder>, Error> {
                 .unwrap();
             flags.extend(extra_flags.into_iter());
         } else if line.contains("bindgen-unstable") &&
-                  cfg!(feature = "llvm_stable") {
+                  cfg!(feature = "testing_only_llvm_stable") {
             return Ok(None);
         } else if line.contains("bindgen-osx-only") {
             let prepend_flags = ["--raw-line", "#![cfg(target_os=\"macos\")]"];