diff --git a/.drone.yml b/.drone.yml
index bc95a8247..26210c516 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,6 +12,8 @@ steps:
         path: /var/run/docker.sock
       - name: docker2
         path: /var/lib/docker
+      - name: nuget
+        path: /root/.nuget/packages
     when:
       event:
         - pull_request
@@ -28,6 +30,8 @@ steps:
         path: /var/run/docker.sock
       - name: docker2
         path: /var/lib/docker
+      - name: nuget
+        path: /root/.nuget/packages
     environment:
       DOCKER_USERNAME:
         from_secret: DOCKER_USERNAME
@@ -51,6 +55,8 @@ steps:
         path: /var/run/docker.sock
       - name: docker2
         path: /var/lib/docker
+      - name: nuget
+        path: /root/.nuget/packages
     environment:
       DOCKER_USERNAME:
         from_secret: DOCKER_USERNAME
@@ -73,6 +79,8 @@ steps:
         path: /var/run/docker.sock
       - name: docker2
         path: /var/lib/docker
+      - name: nuget
+        path: /root/.nuget/packages
     when:
       event:
         - tag
@@ -154,4 +162,7 @@ volumes:
       path: /var/run/docker.sock
   - name: docker2
     host:
-      path: /var/lib/docker
\ No newline at end of file
+      path: /var/lib/docker
+  - name: nuget
+    host:
+      path: /var/lib/nuget
\ No newline at end of file
diff --git a/.testrunsettings b/.testrunsettings
new file mode 100644
index 000000000..0082141a9
--- /dev/null
+++ b/.testrunsettings
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <RunConfiguration>
+    <MaxCpuCount>4</MaxCpuCount>
+  </RunConfiguration>
+</RunSettings>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 86485f677..7b5213883 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,12 +19,7 @@ RUN cp -a /tmp/node_modules src/Squidex/ \
  && npm run build
  
 # Test Backend
-RUN dotnet restore \
- && dotnet test --filter Category!=Dependencies tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj \ 
- && dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \ 
- && dotnet test tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj \
- && dotnet test tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj \
- && dotnet test tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj
+RUN dotnet restore && dotnet test -s ../../.testrunsettings --filter Category!=Dependencies
 
 # Publish
 RUN dotnet publish src/Squidex/Squidex.csproj --output /out/alpine --configuration Release -r alpine.3.7-x64
diff --git a/Dockerfile.build b/Dockerfile.build
index 30a5d3091..f1468b1e0 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -16,12 +16,7 @@ RUN cp -a /tmp/node_modules src/Squidex/ \
  && npm run build
  
 # Test Backend
-RUN dotnet restore \
- && dotnet test --filter Category!=Dependencies tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj \ 
- && dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \ 
- && dotnet test tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj \
- && dotnet test tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj \
- && dotnet test tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj
+RUN dotnet restore && dotnet test -s ../../.testrunsettings --filter Category!=Dependencies
 
 # Publish
 RUN dotnet publish src/Squidex/Squidex.csproj --output /out/ --configuration Release
\ No newline at end of file