diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 5035723b85..0cfa049581 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -6,6 +6,7 @@ Website: https://developer.mozilla.org/en-US/docs/Web/JavaScript
 */
 
 function(hljs) {
+  var SELF_CLOSING_TAG = /<[A-Za-z0-9\\._:-]+\s*\/>/;
   var IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
   var KEYWORDS = {
     keyword:
@@ -189,16 +190,15 @@ function(hljs) {
           },
           { // E4X / JSX
             className: 'jsx',
-            begin: /<[A-Za-z0-9\\._:-]+/, end: /(\/[A-Za-z0-9\\._:-]+\/?)>/,
+            begin: /<[A-Za-z0-9\\._:-]+/, end: /(\/[A-Za-z0-9\\._:-]+)>/,
             subLanguage: 'xml',
             contains: [
-              // self-closing tag
-              { begin: /<[A-Za-z0-9\\._:-]+\s*\/>/, skip: true },
+              { begin: SELF_CLOSING_TAG, skip: true },
               // manually closed tag
               {
-                begin: /<[A-Za-z0-9\\._:-]+/, end: /(\/[A-Za-z0-9\\._:-]+\/?)>/, skip: true,
+                begin: /<[A-Za-z0-9\\._:-]+/, end: /(\/[A-Za-z0-9\\._:-]+)>/, skip: true,
                 contains: [
-                  { begin: /<[A-Za-z0-9\\._:-]+\s*\/>/, skip: true },
+                  { begin: SELF_CLOSING_TAG, skip: true },
                   'self'
                 ]
               },