diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 6f44bacb..061539ce 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -28,6 +28,8 @@ jobs:
         uses: dart-lang/setup-dart@v1
       - name: Setup
         run: ./tool/setup.sh
+      - name: Build test Docker image
+        run: ./tool/build-dev-container.sh
 
       - name: Check formatting
         run: melos run format-check
diff --git a/melos.yaml b/melos.yaml
index 50d3d8c6..aa7b8315 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -21,4 +21,4 @@ ide:
 scripts:
   format-check: dart format --output=none --set-exit-if-changed --line-length 120 .
   analyze: dart analyze --fatal-infos .
-  test: melos exec --concurrency=1 --fail-fast --dir-exists=test -- "flutter test"
+  test: melos exec --concurrency=1 --fail-fast --dir-exists=test -- "flutter test --concurrency=$(nproc --all)"
diff --git a/packages/nextcloud/test/core.dart b/packages/nextcloud/test/core_test.dart
similarity index 94%
rename from packages/nextcloud/test/core.dart
rename to packages/nextcloud/test/core_test.dart
index 596b25e1..0eb70ca7 100644
--- a/packages/nextcloud/test/core.dart
+++ b/packages/nextcloud/test/core_test.dart
@@ -1,4 +1,3 @@
-import 'package:crypto/crypto.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:test/test.dart';
 
@@ -102,17 +101,17 @@ Future run(final DockerImage image) async {
 
     test('Get preview', () async {
       final response = await client.core.getPreview(file: 'Nextcloud.png');
-      expect(sha1.convert(response).toString(), '168c31b76ae4e8bdc5f8edd4c896f40e9d4afe1e');
+      expect(response, isNotEmpty);
     });
 
     test('Get avatar', () async {
       final response = await client.core.getAvatar(userId: 'admin', size: 32);
-      expect(sha1.convert(response).toString(), '618830d6512203281de64cc738e8a7b0cc3d1f47');
+      expect(response, isNotEmpty);
     });
 
     test('Get dark avatar', () async {
       final response = await client.core.getDarkAvatar(userId: 'admin', size: 32);
-      expect(sha1.convert(response).toString(), 'e7294d71b817d05940574061008c80a7d7a04b87');
+      expect(response, isNotEmpty);
     });
 
     test('Delete app password', () async {
diff --git a/packages/nextcloud/test/helper.dart b/packages/nextcloud/test/helper.dart
index c2bf6d1a..17abb043 100644
--- a/packages/nextcloud/test/helper.dart
+++ b/packages/nextcloud/test/helper.dart
@@ -47,7 +47,7 @@ class DockerContainer {
       );
 
   Future<String> collectLogs() async {
-    final apacheLogs = (await runExecutableArguments(
+    final serverLogs = (await runExecutableArguments(
       'docker',
       [
         'logs',
@@ -68,7 +68,7 @@ class DockerContainer {
     ))
         .stdout as String;
 
-    return '$apacheLogs\n\n$nextcloudLogs';
+    return '$serverLogs\n\n$nextcloudLogs';
   }
 }
 
@@ -138,9 +138,7 @@ Future<TestNextcloudClient> getTestClient(
     try {
       await client.core.getStatus();
       break;
-    } catch (_) {
-      await Future.delayed(const Duration(milliseconds: 100));
-    }
+    } catch (_) {}
   }
 
   return client;
@@ -196,8 +194,6 @@ Future<DockerImage> getDockerImage() async {
       '-',
       '../../tool',
     ],
-    stdout: stdout,
-    stderr: stderr,
     stdin: inputStream.stream,
   );
   inputStream.add(utf8.encode(File('../../tool/Dockerfile.dev').readAsStringSync()));
diff --git a/packages/nextcloud/test/main_test.dart b/packages/nextcloud/test/main_test.dart
deleted file mode 100644
index 253d5a05..00000000
--- a/packages/nextcloud/test/main_test.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-import 'core.dart' as core;
-import 'helper.dart';
-import 'news.dart' as news;
-import 'notes.dart' as notes;
-import 'notifications.dart' as notifications;
-import 'provisioning_api.dart' as provisioning_api;
-import 'uppush.dart' as uppush;
-import 'user_status.dart' as user_status;
-import 'webdav.dart' as webdav;
-
-Future main() async {
-  final image = await getDockerImage();
-  await core.run(image);
-  await news.run(image);
-  await notes.run(image);
-  await notifications.run(image);
-  await provisioning_api.run(image);
-  await uppush.run(image);
-  await user_status.run(image);
-  await webdav.run(image);
-}
diff --git a/packages/nextcloud/test/news.dart b/packages/nextcloud/test/news_test.dart
similarity index 100%
rename from packages/nextcloud/test/news.dart
rename to packages/nextcloud/test/news_test.dart
diff --git a/packages/nextcloud/test/notes.dart b/packages/nextcloud/test/notes_test.dart
similarity index 100%
rename from packages/nextcloud/test/notes.dart
rename to packages/nextcloud/test/notes_test.dart
diff --git a/packages/nextcloud/test/notifications.dart b/packages/nextcloud/test/notifications_test.dart
similarity index 100%
rename from packages/nextcloud/test/notifications.dart
rename to packages/nextcloud/test/notifications_test.dart
diff --git a/packages/nextcloud/test/provisioning_api.dart b/packages/nextcloud/test/provisioning_api_test.dart
similarity index 100%
rename from packages/nextcloud/test/provisioning_api.dart
rename to packages/nextcloud/test/provisioning_api_test.dart
diff --git a/packages/nextcloud/test/uppush.dart b/packages/nextcloud/test/uppush_test.dart
similarity index 100%
rename from packages/nextcloud/test/uppush.dart
rename to packages/nextcloud/test/uppush_test.dart
diff --git a/packages/nextcloud/test/user_status.dart b/packages/nextcloud/test/user_status_test.dart
similarity index 100%
rename from packages/nextcloud/test/user_status.dart
rename to packages/nextcloud/test/user_status_test.dart
diff --git a/packages/nextcloud/test/webdav.dart b/packages/nextcloud/test/webdav_test.dart
similarity index 100%
rename from packages/nextcloud/test/webdav.dart
rename to packages/nextcloud/test/webdav_test.dart
diff --git a/tool/Dockerfile.dev b/tool/Dockerfile.dev
index f585d46d..988f86f7 100644
--- a/tool/Dockerfile.dev
+++ b/tool/Dockerfile.dev
@@ -1,7 +1,5 @@
-FROM nextcloud:27.0.0
+FROM nextcloud:27.0.0-fpm-alpine
 WORKDIR /usr/src/nextcloud
-RUN chown -R www-data:www-data .
-USER www-data
 
 RUN ./occ maintenance:install --admin-pass admin --admin-email admin@example.com
 RUN ./occ config:system:set allow_local_remote_servers --value=true
@@ -16,8 +14,9 @@ RUN ./occ app:install notes --force --allow-unstable # 4.8.0
 RUN ./occ app:install uppush --force --allow-unstable # 1.4.0
 
 RUN ./occ app:enable password_policy
-# TODO: This stopped working randomly with apache not being able to bind to the port during build. Must be some docker changes?
-#RUN (bash /entrypoint.sh apache2-foreground &) && \
-#    until curl -s -o /dev/null http://localhost/status.php; do true; done && \
-#    for user in admin user1 user2; do curl -u "$user:$user" -H "ocs-apirequest: true" -s -o /dev/null http://localhost/ocs/v2.php/cloud/user; done
+RUN (sh /entrypoint.sh php -S 0.0.0.0:8080 &) && \
+    until curl -s -o /dev/null http://localhost:8080/status.php; do true; done && \
+    for user in admin user1 user2; do curl -u "$user:$user" -H "ocs-apirequest: true" -s -o /dev/null http://localhost:8080/ocs/v2.php/cloud/user; done
 COPY --chown=www-data:www-data overlay /usr/src/nextcloud/
+
+CMD ["php", "-S", "0.0.0.0:80"]
diff --git a/tool/update.sh b/tool/update.sh
index b422e3c6..fd6c4aa9 100755
--- a/tool/update.sh
+++ b/tool/update.sh
@@ -27,7 +27,7 @@ elif [ -d "external/nextcloud-$1" ]; then
       # shellcheck disable=SC2001
       latest_version=$(echo "$latest_tag" | sed "s/^v//")
       if [[ "$1" == "server" ]]; then
-        sed -i "s/FROM nextcloud:.*/FROM nextcloud:$latest_version/" ../../tool/Dockerfile.dev
+        sed -i "s/FROM nextcloud:.*/FROM nextcloud:$latest_version-fpm-alpine/" ../../tool/Dockerfile.dev
       else
         sed -i "s/RUN \.\/occ app:install $1 .*/RUN .\/occ app:install $1 --force --allow-unstable # $latest_version/" ../../tool/Dockerfile.dev
       fi