diff --git a/Cargo.toml b/Cargo.toml
index aefc602..527b14e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,3 +12,6 @@ repository = "https://github.com/ebfull/pairing"
 [dependencies]
 rand = "0.3"
 byteorder = "1.1"
+
+[features]
+unstable-wnaf = []
diff --git a/src/lib.rs b/src/lib.rs
index e8c55e1..2d600d9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,6 +11,8 @@ extern crate byteorder;
 pub mod tests;
 
 pub mod bls12_381;
+
+#[cfg(feature = "unstable-wnaf")]
 pub mod wnaf;
 
 use std::fmt;
diff --git a/src/tests/curve.rs b/src/tests/curve.rs
index 86dd81a..ea21f90 100644
--- a/src/tests/curve.rs
+++ b/src/tests/curve.rs
@@ -62,6 +62,10 @@ pub fn curve_tests<G: CurveProjective>()
     random_encoding_tests::<G::Affine>();
 }
 
+#[cfg(not(feature = "unstable-wnaf"))]
+fn random_wnaf_tests<G: CurveProjective>() { }
+
+#[cfg(feature = "unstable-wnaf")]
 fn random_wnaf_tests<G: CurveProjective>() {
     use ::wnaf::*;
     use ::PrimeField;