--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,7 +47,6 @@
     krenametest.cpp
     krenametokensorter.cpp
     krenamewindow.cpp
-    modeltest.cpp
     numberdialog.cpp
     insertpartfilenamedlg.cpp
     threadedlister.cpp
--- a/src/krenameimpl.cpp
+++ b/src/krenameimpl.cpp
@@ -31,8 +31,6 @@
 #include "threadedlister.h"
 #include "tokenhelpdialog.h"
 
-#include "modeltest.h"
-
 #include <kconfig.h>
 #include <kiconloader.h>
 #include <KFileWidget>
@@ -218,10 +216,6 @@
 {
     bool gotFilenames = false;
 
-    if (parser->isSet("test")) {
-        QTimer::singleShot(0, this, SLOT(selfTest()));
-    }
-
     // Add all recursive directoris
     QList<QUrl> recursiveList;
     QStringList directories = parser->values("r");
@@ -374,20 +368,6 @@
     }
 }
 
-void KRenameImpl::selfTest()
-{
-    KRenameTest *test = new KRenameTest();
-    test->startTest();
-
-    new ModelTest(m_model);
-    //new ModelTest( m_previewModel );
-
-    // Make _really_ sure it comes to front
-    test->show();
-    test->raise();
-    test->activateWindow();
-}
-
 void KRenameImpl::slotUpdateCount()
 {
     m_window->setCount(m_vector.size());
--- a/src/krenameimpl.h
+++ b/src/krenameimpl.h
@@ -100,11 +100,6 @@
      */
     void saveConfig();
 
-    /** Start KRename's selftest:
-     *  I.e several unit tests.
-     */
-    void selfTest();
-
     /** Called when the user clicks the "Add..." button.
      *  open a dialog to select files for adding to KRename.
      */