diff --git a/src/diagrams/class/classDiagram.spec.js b/src/diagrams/class/classDiagram.spec.js
index 75fb8699f..baaa9ca65 100644
--- a/src/diagrams/class/classDiagram.spec.js
+++ b/src/diagrams/class/classDiagram.spec.js
@@ -8,14 +8,6 @@ describe('class diagram, ', function () {
       parser.yy = classDb;
     });
 
-    it('should handle backquoted class names', function() {
-      const str =
-        'classDiagram\n' +
-        'class `Car`';
-
-      parser.parse(str);
-    });
-
     it('should handle relation definitions', function () {
       const str =
         'classDiagram\n' +
@@ -28,18 +20,6 @@ describe('class diagram, ', function () {
       parser.parse(str);
     });
 
-    it('should handle backquoted relation definitions', function () {
-      const str =
-        'classDiagram\n' +
-        '`Class01` <|-- Class02\n' +
-        'Class03 *-- Class04\n' +
-        'Class05 o-- Class06\n' +
-        'Class07 .. Class08\n' +
-        'Class09 -- Class1';
-
-      parser.parse(str);
-    });
-
     it('should handle relation definition of different types and directions', function () {
       const str =
         'classDiagram\n' +
@@ -87,17 +67,6 @@ describe('class diagram, ', function () {
       parser.parse(str);
     });
 
-    it('should handle generic class with a literal name', function() {
-      const str =
-        'classDiagram\n' +
-        'class `Car`~T~\n' +
-        'Driver -- `Car` : drives >\n' +
-        '`Car` *-- Wheel : have 4 >\n' +
-        '`Car` -- Person : < owns';
-
-      parser.parse(str);
-    });
-
     it('should break when another `{`is encountered before closing the first one while defining generic class with brackets', function() {
       const str =
         'classDiagram\n' +
@@ -156,22 +125,6 @@ describe('class diagram, ', function () {
         parser.parse(str);
     });
 
-    it('should handle generic class with brackets and a literal name', function() {
-      const str =
-        'classDiagram\n' +
-        'class `Dummy_Class`~T~ {\n' +
-        'String data\n' +
-        '  void methods()\n' +
-        '}\n' +
-        '\n' +
-        'class Flight {\n' +
-        '   flightNumber : Integer\n' +
-        '   departureTime : Date\n' +
-        '}';
-
-        parser.parse(str);
-    });
-
     it('should handle class definitions', function() {
       const str =
         'classDiagram\n' +
diff --git a/src/diagrams/class/parser/classDiagram.jison b/src/diagrams/class/parser/classDiagram.jison
index dca4d0189..9e740b47f 100644
--- a/src/diagrams/class/parser/classDiagram.jison
+++ b/src/diagrams/class/parser/classDiagram.jison
@@ -7,7 +7,6 @@
 /* lexical grammar */
 %lex
 %x string
-%x bqstring
 %x generic
 %x struct
 %x href
@@ -50,10 +49,6 @@
 <string>["]           this.popState();
 <string>[^"]*         return "STR";
 
-[`]                   this.begin("bqstring");
-<bqstring>[`]         this.popState();
-<bqstring>[^`]+       return "BQUOTE_STR";
-
 /*
 ---interactivity command---
 'href' adds a link to the specified node. 'href' can only be specified when the
@@ -219,15 +214,10 @@ statements
     ;
 
 className
-    : 
-    | alphaNumToken { $$=$1; }
-    | classLiteralName { $$=$1; }
+    : alphaNumToken { $$=$1; }
     | alphaNumToken className { $$=$1+$2; }
-    | classLiteralName className { $$=$1+$2; }
     | alphaNumToken GENERICTYPE className { $$=$1+'~'+$2+$3; }
-    | classLiteralName GENERICTYPE className { $$=$1+'~'+$2+$3; }
     | alphaNumToken GENERICTYPE { $$=$1+'~'+$2; }
-    | classLiteralName GENERICTYPE { $$=$1+'~'+$2; }
     ;
 
 statement
@@ -319,6 +309,4 @@ textNoTagsToken: alphaNumToken | SPACE | MINUS | keywords ;
 
 alphaNumToken  : UNICODE_TEXT | NUM | ALPHA;
 
-classLiteralName : BQUOTE_STR;
-
 %%