diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index 539a40f335c9e64b377e9fba993e7e8906094088..04fefc12d30548202540f2b9cf6dea67a3d89d80 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -1,14 +1,23 @@
 
 QT += testlib
 
-FAKEVIMSOURCE = ../../../src/plugins/fakevim
-
-INCLUDEPATH += $$FAKEVIMSOURCE
+FAKEVIMDIR = ../../../src/plugins/fakevim
+UTILSDIR = ../../../src/libs
 
 SOURCES += \
 	main.cpp \
-	$$FAKEVIMSOURCE/handler.cpp
+	$$FAKEVIMDIR/fakevimhandler.cpp \
+	$$FAKEVIMDIR/fakevimactions.cpp \
+	$$UTILSDIR/utils/savedaction.cpp \
+	$$UTILSDIR/utils/pathchooser.cpp \
+	$$UTILSDIR/utils/basevalidatinglineedit.cpp \
 
 HEADERS += \
-	$$FAKEVIMSOURCE/handler.h
+	$$FAKEVIMDIR/fakevimhandler.h \
+	$$FAKEVIMDIR/fakevimactions.h \
+	$$UTILSDIR/utils/savedaction.h \
+	$$UTILSDIR/utils/pathchooser.h \
+	$$UTILSDIR/utils/basevalidatinglineedit.h \
+
+INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR
 
diff --git a/tests/auto/fakevim/main.cpp b/tests/auto/fakevim/main.cpp
index 5445ba3f048621839f5dd9aaf1fb8acc144667ec..ffa132e44c8c54af8297f758fb82ebccb55ccc5e 100644
--- a/tests/auto/fakevim/main.cpp
+++ b/tests/auto/fakevim/main.cpp
@@ -27,7 +27,7 @@
 **
 **************************************************************************/
 
-#include "handler.h"
+#include "fakevimhandler.h"
 
 #include <QtTest/QtTest>
 #include <QtCore/QSet>