diff --git a/ci/run.sh b/ci/run.sh
index 2709617..bda4415 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -51,10 +51,10 @@ case $1 in
         done
         ;;
     *)
-        cargo test --features gen-tests --target $1
-        cargo test --features 'gen-tests c' --target $1
-        cargo test --features gen-tests --target $1 --release
-        cargo test --features 'gen-tests c' --target $1 --release
+        cargo test --no-default-features --features gen-tests --target $1
+        cargo test --no-default-features --features 'gen-tests c' --target $1
+        cargo test --no-default-features --features gen-tests --target $1 --release
+        cargo test --no-default-features --features 'gen-tests c' --target $1 --release
         ;;
 esac
 
diff --git a/src/lib.rs b/src/lib.rs
index 3f8a57e..3fa7923 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,6 @@
 #![cfg_attr(not(stage0), deny(warnings))]
 #![cfg_attr(not(test), no_std)]
-#![cfg_attr(all(feature = "compiler-builtins",
-                not(feature = "gen-tests")), compiler_builtins)]
+#![cfg_attr(feature = "compiler-builtins", compiler_builtins)]
 #![crate_name = "compiler_builtins"]
 #![crate_type = "rlib"]
 #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",