diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 55652c481bd3f07478d90588229b6c3ae755825a..a7c97feee498dd8d2f52211bebf5a0b90533f1fa 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -1583,6 +1583,7 @@ fn visit_item(&mut self, i: &'a ast::Item) {
                 }
             }
 
+            ast::ItemKind::Static(..) |
             ast::ItemKind::Const(_,_) => {
                 if i.ident.name == "_" {
                     gate_feature_post!(&self, underscore_const_names, i.span,
diff --git a/src/test/ui/underscore_const_names_feature_gate.rs b/src/test/ui/underscore_const_names_feature_gate.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b2174036dede0348a6ca8e610e8090889ae0e93b
--- /dev/null
+++ b/src/test/ui/underscore_const_names_feature_gate.rs
@@ -0,0 +1,14 @@
+// Copyright 2012-2018 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.
+
+const _: () = (); //~ ERROR is unstable
+static _: () = (); //~ ERROR is unstable
+
+fn main() {}
diff --git a/src/test/ui/underscore_const_names_feature_gate.stderr b/src/test/ui/underscore_const_names_feature_gate.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..c97b3f8d4d3cd77bc722d73c40e6f943b10d367b
--- /dev/null
+++ b/src/test/ui/underscore_const_names_feature_gate.stderr
@@ -0,0 +1,19 @@
+error[E0658]: naming constants with `_` is unstable (see issue #54912)
+  --> $DIR/underscore_const_names_feature_gate.rs:11:1
+   |
+LL | const _: () = (); //~ ERROR is unstable
+   | ^^^^^^^^^^^^^^^^^
+   |
+   = help: add #![feature(underscore_const_names)] to the crate attributes to enable
+
+error[E0658]: naming constants with `_` is unstable (see issue #54912)
+  --> $DIR/underscore_const_names_feature_gate.rs:12:1
+   |
+LL | static _: () = (); //~ ERROR is unstable
+   | ^^^^^^^^^^^^^^^^^^
+   |
+   = help: add #![feature(underscore_const_names)] to the crate attributes to enable
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0658`.