diff --git a/src/librustc/front/feature_gate.rs b/src/librustc/front/feature_gate.rs
index ae6c6ec68312..15056d9d2d84 100644
--- a/src/librustc/front/feature_gate.rs
+++ b/src/librustc/front/feature_gate.rs
@@ -49,12 +49,7 @@ static KNOWN_FEATURES: &'static [(&'static str, Status)] = &[
     ("trace_macros", Active),
     ("simd", Active),
     ("default_type_params", Active),
-    ("quote_tokens", Active),
-    ("quote_expr", Active),
-    ("quote_ty", Active),
-    ("quote_item", Active),
-    ("quote_pat", Active),
-    ("quote_stmt", Active),
+    ("quote", Active),
 
     // These are used to test this portion of the compiler, they don't actually
     // mean anything
@@ -221,7 +216,7 @@ impl Visitor<()> for Context {
         } else {
             for &quote in quotes.iter() {
                 if id == self.sess.ident_of(quote) {
-                  self.gate_feature(quote, path.span, quote + msg);
+                  self.gate_feature("quote", path.span, quote + msg);
                 }
             }
         }
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 2d65fa0640ea..f80b30126f85 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -29,7 +29,7 @@ This API is completely unstable and subject to change.
 
 #[feature(macro_rules, globs, struct_variant, managed_boxes)];
 #[allow(unknown_features)]; // Note: remove it after a snapshot.
-#[feature(quote_item, quote_expr)];
+#[feature(quote)];
 
 extern mod extra;
 extern mod flate;
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 8f549d528bcf..a61c354e7cd3 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -27,8 +27,8 @@ This API is completely unstable and subject to change.
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
 #[feature(macro_rules, globs, managed_boxes)];
-#[allow(unknown_features)];
-#[feature(quote_expr)];
+#[allow(unknown_features)];// Note: remove it after a snapshot.
+#[feature(quote)];
 
 #[deny(non_camel_case_types)];
 
diff --git a/src/test/auxiliary/macro_crate_test.rs b/src/test/auxiliary/macro_crate_test.rs
index 8fe8d545374e..2867e0f81430 100644
--- a/src/test/auxiliary/macro_crate_test.rs
+++ b/src/test/auxiliary/macro_crate_test.rs
@@ -10,7 +10,7 @@
 
 // force-host
 
-#[feature(globs, macro_registrar, macro_rules, quote_expr)];
+#[feature(globs, macro_registrar, macro_rules, quote)];
 
 extern mod syntax;
 
diff --git a/src/test/compile-fail/qquote-1.rs b/src/test/compile-fail/qquote-1.rs
index 7dd809137512..6dcbf3df9d65 100644
--- a/src/test/compile-fail/qquote-1.rs
+++ b/src/test/compile-fail/qquote-1.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-test Can't use syntax crate here
-#[feature(quote_expr)];
+#[feature(quote)];
 
 extern mod extra;
 extern mod syntax;
diff --git a/src/test/compile-fail/qquote-2.rs b/src/test/compile-fail/qquote-2.rs
index 4ef5e41a3be6..0e5c852fd6ec 100644
--- a/src/test/compile-fail/qquote-2.rs
+++ b/src/test/compile-fail/qquote-2.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-test Can't use syntax crate here
-#[feature(quote_stmt)];
+#[feature(quote)];
 
 extern mod extra;
 extern mod syntax;
diff --git a/src/test/run-pass-fulldeps/qquote.rs b/src/test/run-pass-fulldeps/qquote.rs
index d1bf0abd0d02..dc67ff21585d 100644
--- a/src/test/run-pass-fulldeps/qquote.rs
+++ b/src/test/run-pass-fulldeps/qquote.rs
@@ -10,7 +10,7 @@
 
 // xfail-pretty
 // xfail-test
-#[feature(quote_expr, quote_ty, quote_item, quote_stmt, quote_pat)];
+#[feature(quote)];
 
 extern mod extra;
 extern mod syntax;
diff --git a/src/test/run-pass-fulldeps/quote-tokens.rs b/src/test/run-pass-fulldeps/quote-tokens.rs
index 47bcb3e75750..7429ac45904c 100644
--- a/src/test/run-pass-fulldeps/quote-tokens.rs
+++ b/src/test/run-pass-fulldeps/quote-tokens.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-test
-#[feature(quote_expr, quote_tokens, quote_item, quote_pat, quote_stmt)];
+#[feature(quote)];
 #[feature(managed_boxes)];
 
 extern mod syntax;
diff --git a/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs b/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs
index a7979d19389d..0411c0b1cea3 100644
--- a/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs
+++ b/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs
@@ -10,7 +10,7 @@
 
 // xfail-fast
 // xfail-android
-#[feature(quote_expr)];
+#[feature(quote)];
 #[deny(unused_variable)];
 
 extern mod syntax;