diff --git a/src/type/__tests__/validation-test.js b/src/type/__tests__/validation-test.js
index 7243cdbf29..538b0fc7a5 100644
--- a/src/type/__tests__/validation-test.js
+++ b/src/type/__tests__/validation-test.js
@@ -1188,6 +1188,43 @@ describe('Type System: Enum types must be well defined', () => {
     );
   });
 
+  it('rejects an Enum type with incorrectly named values', () => {
+    function enumValue(name) {
+      return new GraphQLEnumType({
+        name: 'SomeEnum',
+        values: {
+          [name]: {}
+        }
+      });
+    }
+
+    expect(() => enumValue('#value')
+    ).to.throw('Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but "#value" does not.');
+
+    expect(() => enumValue('true')
+    ).to.throw('Name "true" is can not be used for Enum value.');
+
+    expect(() => enumValue('false')
+    ).to.throw('Name "false" is can not be used for Enum value.');
+
+    expect(() => enumValue('null')
+    ).to.throw('Name "null" is can not be used for Enum value.');
+  });
+
+  it('does not allow isDeprecated without deprecationReason on enum', () => {
+    expect(() =>
+      new GraphQLEnumType({
+        name: 'SomeEnum',
+        values: {
+          value: { isDeprecated: true }
+        }
+      })
+    ).to.throw(
+      'SomeEnum.value should provide "deprecationReason" instead ' +
+      'of "isDeprecated".'
+    );
+  });
+
 });
 
 
@@ -2065,18 +2102,4 @@ describe('Objects must adhere to Interface they implement', () => {
     );
   });
 
-  it('does not allow isDeprecated without deprecationReason on enum', () => {
-    expect(() =>
-      new GraphQLEnumType({
-        name: 'SomeEnum',
-        values: {
-          value: { isDeprecated: true }
-        }
-      })
-    ).to.throw(
-      'SomeEnum.value should provide "deprecationReason" instead ' +
-      'of "isDeprecated".'
-    );
-  });
-
 });
diff --git a/src/type/definition.js b/src/type/definition.js
index ef98fd1154..4c459c7cf6 100644
--- a/src/type/definition.js
+++ b/src/type/definition.js
@@ -942,6 +942,11 @@ function defineEnumValues(
   );
   return valueNames.map(valueName => {
     assertValidName(valueName);
+    invariant(
+      [ 'true', 'false', 'null' ].indexOf(valueName) === -1,
+      `Name "${valueName}" is can not be used for Enum value.`
+    );
+
     const value = valueMap[valueName];
     invariant(
       isPlainObj(value),