diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 08eec0f9117f8..59f3e07b0fa08 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -362,9 +362,6 @@ declare_features! (
     // rustc internal
     (active, abi_thiscall, "1.19.0", None),
 
-    // Allows a test to fail without failing the whole suite
-    (active, allow_fail, "1.19.0", Some(42219)),
-
     // Allows unsized tuple coercion.
     (active, unsized_tuple_coercion, "1.20.0", Some(42877)),
 
@@ -542,6 +539,8 @@ declare_features! (
     // Allows the sysV64 ABI to be specified on all platforms
     // instead of just the platforms on which it is the C ABI
     (accepted, abi_sysv64, "1.24.0", Some(36167)),
+    // Allows a test to fail without failing the whole suite
+    (accepted, allow_fail, "1.25.0", Some(42219)),
 );
 
 // If you change this, please modify src/doc/unstable-book as well. You must
@@ -958,10 +957,7 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
                                              "used internally by rustc",
                                              cfg_fn!(rustc_attrs))),
 
-    ("allow_fail", Normal, Gated(Stability::Unstable,
-                                 "allow_fail",
-                                 "allow_fail attribute is currently unstable",
-                                 cfg_fn!(allow_fail))),
+    ("allow_fail", Normal, Ungated),
 
     ("rustc_std_internal_symbol", Whitelisted, Gated(Stability::Unstable,
                                      "rustc_attrs",
diff --git a/src/test/run-pass/test-allow-fail-attr.rs b/src/test/run-pass/test-allow-fail-attr.rs
index 884633df66b1b..d9e0cb72d270f 100644
--- a/src/test/run-pass/test-allow-fail-attr.rs
+++ b/src/test/run-pass/test-allow-fail-attr.rs
@@ -10,7 +10,6 @@
 
 // ignore-wasm32-bare compiled with panic=abort by default
 // compile-flags: --test
-#![feature(allow_fail)]
 
 #[test]
 #[allow_fail]
diff --git a/src/test/ui/feature-gate-allow_fail.rs b/src/test/ui/feature-gate-allow_fail.rs
deleted file mode 100644
index 1124740280960..0000000000000
--- a/src/test/ui/feature-gate-allow_fail.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// check that #[allow_fail] is feature-gated
-
-#[allow_fail] //~ ERROR allow_fail attribute is currently unstable
-fn ok_to_fail() {
-    assert!(false);
-}
-