diff --git a/tests/manual/fakevim/fakevim.pro b/tests/manual/fakevim/fakevim.pro
index 8624a100b370ba3738b5e7813f04a4b505148904..141cf20d5ec10fac79d6582936417375d30df4c8 100644
--- a/tests/manual/fakevim/fakevim.pro
+++ b/tests/manual/fakevim/fakevim.pro
@@ -1,11 +1,21 @@
 
 FAKEVIMHOME = ../../../src/plugins/fakevim
+UTILSDIR = ../../../src/libs
 
 SOURCES += \
 	main.cpp \
-	$$FAKEVIMHOME/fakevimhandler.cpp
+	$$FAKEVIMHOME/fakevimhandler.cpp \
+	$$FAKEVIMHOME/fakevimactions.cpp \
+	$$UTILSDIR/utils/savedaction.cpp \
+	$$UTILSDIR/utils/pathchooser.cpp \
+	$$UTILSDIR/utils/basevalidatinglineedit.cpp \
 
 HEADERS += \
-	$$FAKEVIMHOME/fakevimhandler.h
+	$$FAKEVIMHOME/fakevimhandler.h \
+	$$FAKEVIMHOME/fakevimactions.h \
+	$$UTILSDIR/utils/savedaction.h \
+	$$UTILSDIR/utils/pathchooser.h \
+	$$UTILSDIR/utils/basevalidatinglineedit.h \
+
+INCLUDEPATH += $$FAKEVIMHOME $$UTILSDIR
 
-INCLUDEPATH += $$FAKEVIMHOME
diff --git a/tests/manual/fakevim/main.cpp b/tests/manual/fakevim/main.cpp
index a78453528a2193f94b59966f0fc1120537e2e884..1d31d998403c7eae8cf93cf14b342cf097c93a33 100644
--- a/tests/manual/fakevim/main.cpp
+++ b/tests/manual/fakevim/main.cpp
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
 
     QObject::connect(&handler, SIGNAL(commandBufferChanged(QString)),
         &proxy, SLOT(changeStatusMessage(QString)));
-    QObject::connect(&handler, SIGNAL(quitRequested()),
+    QObject::connect(&handler, SIGNAL(quitRequested(bool)),
         &app, SLOT(quit()));
     QObject::connect(&handler,
         SIGNAL(selectionChanged(QList<QTextEdit::ExtraSelection>)),
@@ -118,6 +118,8 @@ int main(int argc, char *argv[])
     QObject::connect(&handler, SIGNAL(statusDataChanged(QString)),
         &proxy, SLOT(changeStatusData(QString)));
 
+    theFakeVimSetting(ConfigUseFakeVim)->setValue(true);
+    handler.installEventFilter();
     handler.setupWidget();
     if (args.size() >= 1)
         handler.handleCommand("r " + args.at(0));