diff --git a/tests/auto/configurations/testconfigurations.cpp b/tests/auto/configurations/testconfigurations.cpp
index 0611b389..d37c6980 100644
--- a/tests/auto/configurations/testconfigurations.cpp
+++ b/tests/auto/configurations/testconfigurations.cpp
@@ -40,11 +40,13 @@ class TestConfigurations: public GuhTestBase
 
 private slots:
     void getConfigurations();
+
     void testTimeZones();
     void testServerName();
-
     void testLanguages();
 
+    void testTcpServerConfiguration();
+
 private:
     QVariantMap loadBasicConfiguration();
 
diff --git a/tests/auto/settings/settings.pro b/tests/auto/settings/settings.pro
deleted file mode 100644
index 1c9678b5..00000000
--- a/tests/auto/settings/settings.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-include(../../../guh.pri)
-include(../autotests.pri)
-
-TARGET = testsettings
-SOURCES += testsettings.cpp
diff --git a/tests/auto/settings/testsettings.cpp b/tests/auto/settings/testsettings.cpp
deleted file mode 100644
index dd869166..00000000
--- a/tests/auto/settings/testsettings.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *                                                                         *
- *  Copyright (C) 2015 Simon Stürz <simon.stuerz@guh.io>                   *
- *  Copyright (C) 2014 Michael Zanetti <michael_zanetti@gmx.net>           *
- *                                                                         *
- *  This file is part of guh.                                              *
- *                                                                         *
- *  Guh is free software: you can redistribute it and/or modify            *
- *  it under the terms of the GNU General Public License as published by   *
- *  the Free Software Foundation, version 2 of the License.                *
- *                                                                         *
- *  Guh is distributed in the hope that it will be useful,                 *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- *  GNU General Public License for more details.                           *
- *                                                                         *
- *  You should have received a copy of the GNU General Public License      *
- *  along with guh. If not, see <http://www.gnu.org/licenses/>.            *
- *                                                                         *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "guhtestbase.h"
-#include "guhcore.h"
-#include "devicemanager.h"
-#include "guhsettings.h"
-#include "logging/logentry.h"
-#include "plugin/deviceplugin.h"
-
-#include <QDebug>
-#include "guhsettings.h"
-
-using namespace guhserver;
-
-class TestSettings : public GuhTestBase
-{
-    Q_OBJECT
-
-private:
-
-
-private slots:
-    void getSetLanguages();
-
-
-};
-
-void TestSettings::getSetLanguages()
-{
-
-}
-
-#include "testsettings.moc"
-QTEST_MAIN(TestSettings)
-