diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7699ca7058..8cf6572b93 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -41,8 +41,3 @@ Style/GlobalVars:
 Style/IfUnlessModifier:
   Enabled: false
 
-# Offense count: 6
-# Cop supports --auto-correct.
-Style/LeadingCommentSpace:
-  Enabled: false
-
diff --git a/Gemfile.lock b/Gemfile.lock
index e9df15d19d..826f0b7fda 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,7 +58,7 @@ GEM
       watir-webdriver (>= 0.6.9)
     page_navigation (0.9)
       data_magic (>= 0.14)
-    parser (2.2.0.pre.7)
+    parser (2.2.0.pre.8)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
diff --git a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 7f3f051286..b2dd0cd22b 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -87,7 +87,7 @@ end
 When(/^I send right arrow times (\d+)$/) do |number|
   number.to_i.times do
     on(VisualEditorPage).content_element.send_keys :arrow_right
-    on(VisualEditorPage).content_element.fire_event('onblur') #gerrit 86800/86801
+    on(VisualEditorPage).content_element.fire_event('onblur') # gerrit 86800/86801
   end
 end
 
diff --git a/modules/ve-mw/tests/browser/features/support/hooks.rb b/modules/ve-mw/tests/browser/features/support/hooks.rb
index ca0a93a82a..0bc32dadd9 100644
--- a/modules/ve-mw/tests/browser/features/support/hooks.rb
+++ b/modules/ve-mw/tests/browser/features/support/hooks.rb
@@ -2,7 +2,7 @@ at_exit do
   $browser.close unless ENV['KEEP_BROWSER_OPEN'] == 'true'
 end
 
-#This is for the multiedit test
+# This is for the multiedit test
 Before('@edit_user_page_login') do
   if (!$edit_user_page_login || !(ENV['REUSE_BROWSER'] == 'true')) && @browser
     step 'I am logged in'
diff --git a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index d6d56b8b0f..9b08946db5 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -162,9 +162,9 @@ class VisualEditorPage
     span(:another_save_page, class: 'oo-ui-labelElement-label', text: 'Save page', frame: frame)
     text_field(:link_textfield, index: 0, frame: frame)
     span(:links_done, text: 'Done', frame: frame)
-    div(:content_box, class: 've-ce-documentNode ve-ce-branchNode', frame: frame) #ALSO USED IN LANGUAGE SCREENSHOT
+    div(:content_box, class: 've-ce-documentNode ve-ce-branchNode', frame: frame) # ALSO USED IN LANGUAGE SCREENSHOT
 
-    #USED IN LANGUAGE SCREENSHOT TEST:
+    # USED IN LANGUAGE SCREENSHOT TEST:
     text_field(:media_alternative_text, css: 'div.oo-ui-widget.oo-ui-widget-enabled.oo-ui-inputWidget.oo-ui-textInputWidget.ve-ui-mwMediaDialog-altText > input', frame: frame)
     div(:media_alternative_block, class: 'oo-ui-layout oo-ui-iconElement oo-ui-labelElement oo-ui-fieldsetLayout', index: 1, frame: frame)
     list_item(:media_advanced_settings, class: 'oo-ui-widget oo-ui-widget-enabled oo-ui-optionWidget oo-ui-decoratedOptionWidget oo-ui-outlineItemWidget oo-ui-outlineItemWidget-level-0 oo-ui-iconElement oo-ui-labelElement', frame: frame)