diff --git a/.travis.yml b/.travis.yml
index 90c64fe4a..d1ed3ec6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,4 +46,4 @@ script:
 after_script:
   - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../lib/gmake/x64/:../extlibs/lib/gmake/x64/ &&
     cd ../../tests &&
-    ./NazaraUnitTests
+    ./NazaraUnitTestsServer
diff --git a/appveyor.yml b/appveyor.yml
index 1dbe500e9..f91b3a927 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,13 +36,11 @@ platform:
 
 build:
   project: build/$(TOOLSET)/NazaraEngine.sln
-  
-#after_build:
-#  - cd tests && "./NazaraUnitTests"
 
 after_build:
   - cd build && "./premake5.exe" package && cd ../package
-  - 7z a NazaraEngine.7z *
+  - 7z a NazaraEngine.7z * && cd ..
+  - cd tests && "./NazaraUnitTestsServer.exe"
 
 artifacts:
   - path: package/NazaraEngine.7z
diff --git a/build/scripts/tools/ndk_server.lua b/build/scripts/tools/ndk_server.lua
index cebd158c6..b5d258283 100644
--- a/build/scripts/tools/ndk_server.lua
+++ b/build/scripts/tools/ndk_server.lua
@@ -38,7 +38,6 @@ TOOL.FilesExcluded = {
 	"../SDK/**/LuaBinding_Renderer.*"
 }
 
-
 TOOL.Libraries = {
 	"NazaraCore",
 	"NazaraLua",
diff --git a/build/scripts/tools/unittests_server.lua b/build/scripts/tools/unittests_server.lua
new file mode 100644
index 000000000..b3eab27c0
--- /dev/null
+++ b/build/scripts/tools/unittests_server.lua
@@ -0,0 +1,34 @@
+TOOL.Name = "UnitTestsServer"
+
+TOOL.Directory = "../tests"
+TOOL.EnableConsole = true
+TOOL.Kind = "Application"
+TOOL.TargetDirectory = TOOL.Directory
+
+TOOL.Defines = {
+	"NDK_SERVER"
+}
+
+TOOL.Includes = {
+	"../include"
+}
+
+TOOL.Files = {
+	"../tests/main.cpp",
+	"../tests/Engine/**.cpp",
+	"../tests/SDK/**.cpp"
+}
+
+-- Excludes client-only files
+TOOL.FilesExcluded = {
+	"../tests/Engine/Audio/**",
+	"../tests/Engine/Graphics/**",
+	"../tests/SDK/NDK/Application.cpp",
+	"../tests/SDK/NDK/Systems/ListenerSystem.cpp",
+	"../tests/SDK/NDK/Systems/RenderSystem.cpp"
+}
+
+TOOL.Libraries = {
+	"NazaraNetwork",
+	"NazaraSDKServer"
+}