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 100%
rename from packages/nextcloud/test/core.dart
rename to packages/nextcloud/test/core_test.dart
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