diff --git a/src/plugins/fakevim/handler.cpp b/src/plugins/fakevim/handler.cpp
index 7bdd92f3e1dfc83451abe6c214fb28a00d419f4b..136c7e8a46fdc09a336832b37cac701af80a4ab4 100644
--- a/src/plugins/fakevim/handler.cpp
+++ b/src/plugins/fakevim/handler.cpp
@@ -404,9 +404,11 @@ void FakeVimHandler::Private::handleCommandMode(int key, const QString &text)
             for (int i = qMax(count(), 2) - 1; --i >= 0; ) {
                 m_tc.movePosition(EndOfLine);
                 m_tc.deleteChar();
-                m_tc.insertText(" ");
+                if (!m_gflag)
+                    m_tc.insertText(" ");
             }
-            m_tc.movePosition(Left, MoveAnchor, 1);
+            if (!m_gflag)
+                m_tc.movePosition(Left, MoveAnchor, 1);
         }
     } else if (key == 'k' || key == Key_Up) {
         m_tc.movePosition(Up, KeepAnchor, count());
diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index 696feeec31c49c93078072eed94ad71a216c660f..29936b2568f830affa15379605d726d55b68e6d6 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -1,9 +1,14 @@
 
-load(qttest_p4)
+QT += testlib
+
+FAKEVIMSOURCE = /data/qt-creator/src/plugins/fakevim
+
+INCLUDEPATH += $$FAKEVIMSOURCE
 
 SOURCES += \
-    main.cpp \
-    handler.cpp
+	main.cpp \
+	$$FAKEVIMSOURCE/handler.cpp
+
+HEADERS += \
+	$$FAKEVIMSOURCE/handler.h
 
-HEADER += \
-    handler.h