diff --git a/lib/ace/editor_text_edit_test.js b/lib/ace/editor_text_edit_test.js
index c145f474..77ec34ed 100644
--- a/lib/ace/editor_text_edit_test.js
+++ b/lib/ace/editor_text_edit_test.js
@@ -42,6 +42,7 @@ var JavaScriptMode = require("./mode/javascript").Mode;
 var UndoManager = require("./undomanager").UndoManager;
 var MockRenderer = require("./test/mockrenderer").MockRenderer;
 var assert = require("./test/assertions");
+var whitespace = require("./ext/whitespace");
 
 module.exports = {
     "test: delete line from the middle" : function() {
@@ -184,7 +185,8 @@ module.exports = {
     "test: comment lines should perserve selection" : function() {
         var session = new EditSession(["  abc", "cde"].join("\n"), new JavaScriptMode());
         var editor = new Editor(new MockRenderer(), session);
-
+        whitespace.detectIndentation(session);
+        
         editor.moveCursorTo(0, 2);
         editor.getSelection().selectDown();
         editor.toggleCommentLines();
@@ -199,6 +201,7 @@ module.exports = {
     "test: uncomment lines should perserve selection" : function() {
         var session = new EditSession(["//   abc", "//cde"].join("\n"), new JavaScriptMode());
         var editor = new Editor(new MockRenderer(), session);
+        session.setTabSize(2);
 
         editor.moveCursorTo(0, 1);
         editor.getSelection().selectDown();
diff --git a/lib/ace/mode/logiql_test.js b/lib/ace/mode/logiql_test.js
index a37b7da2..3e661829 100644
--- a/lib/ace/mode/logiql_test.js
+++ b/lib/ace/mode/logiql_test.js
@@ -46,10 +46,10 @@ module.exports = {
     },
 
     "test: toggle comment lines should prepend '//' to each line" : function() {
-        var session = new EditSession(["  abc", "cde", "fg"]);
+        var session = new EditSession(["    abc", "cde", "fg"]);
 
         this.mode.toggleCommentLines("start", session, 0, 1);
-        assert.equal(["//   abc", "// cde", "fg"].join("\n"), session.toString());
+        assert.equal(["//     abc", "// cde", "fg"].join("\n"), session.toString());
     },
 
     "test: auto indent after ->" : function() {