diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs
index 699765dde03ff..f3c6ff2f2b3a1 100644
--- a/src/librustc_lint/lib.rs
+++ b/src/librustc_lint/lib.rs
@@ -152,6 +152,12 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
                     NON_SNAKE_CASE,
                     NON_UPPER_CASE_GLOBALS);
 
+    add_lint_group!(sess,
+                    "nonstandard_style",
+                    NON_CAMEL_CASE_TYPES,
+                    NON_SNAKE_CASE,
+                    NON_UPPER_CASE_GLOBALS);
+
     add_lint_group!(sess,
                     "unused",
                     UNUSED_IMPORTS,
diff --git a/src/test/ui/lint/lint-group-nonstandard-style.rs b/src/test/ui/lint/lint-group-nonstandard-style.rs
new file mode 100644
index 0000000000000..55d6168e6e008
--- /dev/null
+++ b/src/test/ui/lint/lint-group-nonstandard-style.rs
@@ -0,0 +1,36 @@
+// Copyright 2014–2017 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.
+
+#![deny(nonstandard_style)]
+#![allow(dead_code)]
+
+fn CamelCase() {} //~ ERROR should have a snake
+
+#[allow(nonstandard_style)]
+mod test {
+    fn CamelCase() {}
+
+    #[forbid(nonstandard_style)]
+    mod bad {
+        fn CamelCase() {} //~ ERROR should have a snake
+
+        static bad: isize = 1; //~ ERROR should have an upper
+    }
+
+    mod warn {
+        #![warn(nonstandard_style)]
+
+        fn CamelCase() {} //~ WARN should have a snake
+
+        struct snake_case; //~ WARN should have a camel
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/lint/lint-group-nonstandard-style.stderr b/src/test/ui/lint/lint-group-nonstandard-style.stderr
new file mode 100644
index 0000000000000..b0ce19e35eec7
--- /dev/null
+++ b/src/test/ui/lint/lint-group-nonstandard-style.stderr
@@ -0,0 +1,67 @@
+error: function `CamelCase` should have a snake case name such as `camel_case`
+  --> $DIR/lint-group-nonstandard-style.rs:14:1
+   |
+14 | fn CamelCase() {} //~ ERROR should have a snake
+   | ^^^^^^^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/lint-group-nonstandard-style.rs:11:9
+   |
+11 | #![deny(nonstandard_style)]
+   |         ^^^^^^^^^^^^^^^^^
+   = note: #[deny(non_snake_case)] implied by #[deny(nonstandard_style)]
+
+error: function `CamelCase` should have a snake case name such as `camel_case`
+  --> $DIR/lint-group-nonstandard-style.rs:22:9
+   |
+22 |         fn CamelCase() {} //~ ERROR should have a snake
+   |         ^^^^^^^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/lint-group-nonstandard-style.rs:20:14
+   |
+20 |     #[forbid(nonstandard_style)]
+   |              ^^^^^^^^^^^^^^^^^
+   = note: #[forbid(non_snake_case)] implied by #[forbid(nonstandard_style)]
+
+error: static variable `bad` should have an upper case name such as `BAD`
+  --> $DIR/lint-group-nonstandard-style.rs:24:9
+   |
+24 |         static bad: isize = 1; //~ ERROR should have an upper
+   |         ^^^^^^^^^^^^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/lint-group-nonstandard-style.rs:20:14
+   |
+20 |     #[forbid(nonstandard_style)]
+   |              ^^^^^^^^^^^^^^^^^
+   = note: #[forbid(non_upper_case_globals)] implied by #[forbid(nonstandard_style)]
+
+warning: function `CamelCase` should have a snake case name such as `camel_case`
+  --> $DIR/lint-group-nonstandard-style.rs:30:9
+   |
+30 |         fn CamelCase() {} //~ WARN should have a snake
+   |         ^^^^^^^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/lint-group-nonstandard-style.rs:28:17
+   |
+28 |         #![warn(nonstandard_style)]
+   |                 ^^^^^^^^^^^^^^^^^
+   = note: #[warn(non_snake_case)] implied by #[warn(nonstandard_style)]
+
+warning: type `snake_case` should have a camel case name such as `SnakeCase`
+  --> $DIR/lint-group-nonstandard-style.rs:32:9
+   |
+32 |         struct snake_case; //~ WARN should have a camel
+   |         ^^^^^^^^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/lint-group-nonstandard-style.rs:28:17
+   |
+28 |         #![warn(nonstandard_style)]
+   |                 ^^^^^^^^^^^^^^^^^
+   = note: #[warn(non_camel_case_types)] implied by #[warn(nonstandard_style)]
+
+error: aborting due to 3 previous errors
+