diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index bfee3ee6348f163fcbb77765d74eddd421a3b084..23b56f30c51372885d4f4243d2364d519d4e23a4 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -622,7 +622,7 @@ void BazaarPlugin::testDiffFileResolving_data()
 void BazaarPlugin::testDiffFileResolving()
 {
     BazaarEditor editor(editorParameters + 3, 0);
-    VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
+    editor.testDiffFileResolving();
 }
 #endif
 
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 215a0741e21f57fc079a7150c52de942dfacc0d7..6fffa00c8af180f52a0ea705553fc535c8831ab8 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -1961,7 +1961,7 @@ void ClearCasePlugin::testDiffFileResolving_data()
 void ClearCasePlugin::testDiffFileResolving()
 {
     ClearCaseEditor editor(editorParameters + 3, 0);
-    VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
+    editor.testDiffFileResolving();
 }
 #endif
 
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 2b99b0df0d9a7bc9630add4b5417584d849cb5a4..04873b9c7a354378bfcca700251129e99dc2a704 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -1398,7 +1398,7 @@ void CvsPlugin::testDiffFileResolving_data()
 void CvsPlugin::testDiffFileResolving()
 {
     CvsEditor editor(editorParameters + 3, 0);
-    VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
+    editor.testDiffFileResolving();
 }
 #endif
 
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 033e9d6e1662b91eecd6d5d8f006c5a55a184d61..2f3695cc9e9f547e918fba684835892f1ce128df 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -1312,7 +1312,7 @@ void GitPlugin::testDiffFileResolving_data()
 void GitPlugin::testDiffFileResolving()
 {
     GitEditor editor(editorParameters + 3, 0);
-    VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
+    editor.testDiffFileResolving();
 }
 #endif
 
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 05c8afc6dff462ac32bcfbd3ed743fadd49f715f..892a0b542ac3b673b0e27fa88a3be87509a67502 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -718,7 +718,7 @@ void MercurialPlugin::testDiffFileResolving_data()
 void MercurialPlugin::testDiffFileResolving()
 {
     MercurialEditor editor(editorParameters + 3, 0);
-    VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
+    editor.testDiffFileResolving();
 }
 #endif
 
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 9b663950ad438f4c68756f822463b532c9587536..9059d6c7a24f65b5241d6fa9960de03d436156da 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -1425,7 +1425,7 @@ void SubversionPlugin::testDiffFileResolving_data()
 void SubversionPlugin::testDiffFileResolving()
 {
     SubversionEditor editor(editorParameters + 3, 0);
-    VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
+    editor.testDiffFileResolving();
 }
 #endif
 
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 5cc5aa8fed9e6cf57e5cc45f2c7ccb2b9c496174..6e179aa8768cfe777d03be6957861abfd10f3d06 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -1528,14 +1528,14 @@ Core::IEditor* VcsBaseEditorWidget::locateEditorByTag(const QString &tag)
 #ifdef WITH_TESTS
 #include <QTest>
 
-void VcsBase::VcsBaseEditorWidget::testDiffFileResolving(VcsBaseEditorWidget *editor)
+void VcsBase::VcsBaseEditorWidget::testDiffFileResolving()
 {
     QFETCH(QByteArray, header);
     QFETCH(QByteArray, fileName);
     QTextDocument doc(QString::fromLatin1(header));
-    editor->init();
+    init();
     QTextBlock block = doc.lastBlock();
-    QVERIFY(editor->fileNameFromDiffSpecification(block).endsWith(QString::fromLatin1(fileName)));
+    QVERIFY(fileNameFromDiffSpecification(block).endsWith(QString::fromLatin1(fileName)));
 }
 #endif
 
diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h
index 9d61a03fc360fbbc116f94b79586391f08c63b93..4ee988a5eb8dd82a1dadc32802040c2fdfd05198 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.h
+++ b/src/plugins/vcsbase/vcsbaseeditor.h
@@ -275,7 +275,7 @@ private:
 
 #ifdef WITH_TESTS
 public:
-    static void testDiffFileResolving(VcsBaseEditorWidget *editor);
+    void testDiffFileResolving();
 #endif
 };