diff --git a/.travis.yml b/.travis.yml
index a41c10b84..c8a2faecb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ compiler:
   - gcc
   - clang
 # Build MCServer
-script: cmake . -DCMAKE_BUILD_TYPE=RELEASE && make -j 2
+script: cmake . -DCMAKE_BUILD_TYPE=RELEASE -DSELF_TEST=1 && make -j 2 && cd MCServer/ && ./MCServer
 
 # Notification Settings
 notifications:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fee887e7..57b200a2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,6 +124,10 @@ endif()
 # The Expat library is linked in statically, make the source files aware of that:
 add_definitions(-DXML_STATIC)
 
+# Self Test Mode enables extra checks at startup
+if(${SELF_TEST})
+	add_definitions(-DSELF_TEST)
+endif()
 
 # Declare the flags used for profiling builds:
 if (MSVC)
diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp
index a20583550..f4bae0647 100644
--- a/src/Bindings/PluginManager.cpp
+++ b/src/Bindings/PluginManager.cpp
@@ -172,6 +172,10 @@ 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
 }