diff --git a/.travis.yml b/.travis.yml
index c8a2faecb..38dd2f280 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ compiler:
   - gcc
   - clang
 # Build MCServer
-script: cmake . -DCMAKE_BUILD_TYPE=RELEASE -DSELF_TEST=1 && make -j 2 && cd MCServer/ && ./MCServer
+script: cmake . -DCMAKE_BUILD_TYPE=RELEASE -DSELF_TEST=1 && make -j 2 && cd MCServer/ && (echo stop | ./MCServer)
 
 # Notification Settings
 notifications:
diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp
index f4bae0647..a20583550 100644
--- a/src/Bindings/PluginManager.cpp
+++ b/src/Bindings/PluginManager.cpp
@@ -172,10 +172,6 @@ void cPluginManager::InsertDefaultPlugins(cIniFile & a_SettingsIni)
 	a_SettingsIni.AddValue("Plugins", "Plugin", "Core");
 	a_SettingsIni.AddValue("Plugins", "Plugin", "TransAPI");
 	a_SettingsIni.AddValue("Plugins", "Plugin", "ChatLog");
-	
-	#ifdef SELFTEST
-	a_SettingsIni.AddValue("Plugins", "Plugin", "SelfTest");
-	#endif
 }