diff --git a/src/autotests/CMakeLists.txt b/src/autotests/CMakeLists.txt
index 48c4af33..7cca0339 100644
--- a/src/autotests/CMakeLists.txt
+++ b/src/autotests/CMakeLists.txt
@@ -66,3 +66,11 @@ ecm_mark_as_test(TerminalTest)
 add_test(TerminalTest TerminalTest)
 target_link_libraries(TerminalTest ${KONSOLE_TEST_LIBS})
 
+##add_executable(TerminalInterfaceTest TerminalInterfaceTest.cpp)
+##ecm_mark_as_test(TerminalInterface)
+##add_test(TerminalInterfaceTest TerminalInterfaceTest)
+##target_link_libraries(TerminalInterfaceTest
+##                      ${KDE4_KPARTS_LIBS}
+##                      ${KDE4_KPTY_LIBS}
+##                      ${KONSOLE_TEST_LIBS})
+
diff --git a/src/tests/TerminalInterfaceTest.cpp b/src/autotests/TerminalInterfaceTest.cpp
similarity index 97%
rename from src/tests/TerminalInterfaceTest.cpp
rename to src/autotests/TerminalInterfaceTest.cpp
index 50cf017f..a2face01 100644
--- a/src/tests/TerminalInterfaceTest.cpp
+++ b/src/autotests/TerminalInterfaceTest.cpp
@@ -27,11 +27,12 @@
 #include <KService>
 #include <KDebug>
 #include <qtest_kde.h>
-#include "../Part.h"
+//#include "../Part.h"
 
 using namespace Konsole;
 
 /* In KDE 4.x there are 2 versions: TerminalInterface and TerminalInterfaceV2
+   In KDE 5.x only one: TerminalInterface
    The code below uses both as well the KonsolePart API
 */
 void TerminalInterfaceTest::testTerminalInterface()
@@ -45,7 +46,7 @@ void TerminalInterfaceTest::testTerminalInterface()
     if (!_terminalPart)
         QSKIP("konsolepart not found.", SkipSingle);
 
-    TerminalInterfaceV2* terminal = qobject_cast<TerminalInterfaceV2*>(_terminalPart);
+    TerminalInterface* terminal = qobject_cast<TerminalInterface*>(_terminalPart);
     QVERIFY(terminal);
     terminal->showShellInDir(QDir::home().path());
 
diff --git a/src/tests/TerminalInterfaceTest.h b/src/autotests/TerminalInterfaceTest.h
similarity index 96%
rename from src/tests/TerminalInterfaceTest.h
rename to src/autotests/TerminalInterfaceTest.h
index fcfc75f4..98123f0c 100644
--- a/src/tests/TerminalInterfaceTest.h
+++ b/src/autotests/TerminalInterfaceTest.h
@@ -20,7 +20,7 @@
 #ifndef TERMINALINTERFACETEST_H
 #define TERMINALINTERFACETEST_H
 
-#include <kde_terminal_interface_v2.h>
+#include <kde_terminal_interface.h>
 #include <KParts/Part>
 
 namespace Konsole
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 8d128175..3ea6f4d5 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -9,8 +9,3 @@ ecm_mark_as_test(PartManualTest)
 target_link_libraries(PartManualTest KF5::XmlGui KF5::Parts KF5::Pty
                      ${KONSOLE_TEST_LIBS})
 
-kde4_add_unit_test(TerminalInterfaceTest TerminalInterfaceTest.cpp)
-target_link_libraries(TerminalInterfaceTest
-                      ${KDE4_KPARTS_LIBS}
-                      ${KDE4_KPTY_LIBS}
-                      ${KONSOLE_TEST_LIBS})