diff --git a/packages/nextcloud/test/core_test.dart b/packages/nextcloud/test/core_test.dart
index 18289abe..67ce619a 100644
--- a/packages/nextcloud/test/core_test.dart
+++ b/packages/nextcloud/test/core_test.dart
@@ -3,12 +3,11 @@ import 'package:test/test.dart';
 
 import 'helper.dart';
 
-Future main() async {
-  await run(await getDockerImage());
-}
-
-Future run(final DockerImage image) async {
+void main() {
   group('core', () {
+    late DockerImage image;
+    setUpAll(() async => image = await getDockerImage());
+
     late DockerContainer container;
     late TestNextcloudClient client;
     setUp(() async {
diff --git a/packages/nextcloud/test/news_test.dart b/packages/nextcloud/test/news_test.dart
index abf27e0b..0a82d7d1 100644
--- a/packages/nextcloud/test/news_test.dart
+++ b/packages/nextcloud/test/news_test.dart
@@ -6,15 +6,15 @@ import 'package:test/test.dart';
 
 import 'helper.dart';
 
-Future main() async {
-  await run(await getDockerImage());
-}
-
-Future run(final DockerImage image) async {
+void main() {
   group('news', () {
+    late DockerImage image;
     late HttpServer rssServer;
-    setUpAll(() async => rssServer = await getRssServer());
-    tearDownAll(() => rssServer.close(force: true));
+    setUpAll(() async {
+      image = await getDockerImage();
+      rssServer = await getRssServer();
+    });
+    tearDownAll(() async => rssServer.close(force: true));
 
     late DockerContainer container;
     late TestNextcloudClient client;
@@ -24,12 +24,12 @@ Future run(final DockerImage image) async {
     });
     tearDown(() => container.destroy());
 
-    Future<NewsListFeeds> addWikipediaFeed([final int? folderID]) => client.news.addFeed(
+    Future<NewsListFeeds> addWikipediaFeed([final int? folderID]) async => client.news.addFeed(
           url: 'http://host.docker.internal:${rssServer.port}/wikipedia.xml',
           folderId: folderID,
         );
 
-    Future<NewsListFeeds> addNasaFeed() => client.news.addFeed(
+    Future<NewsListFeeds> addNasaFeed() async => client.news.addFeed(
           url: 'http://host.docker.internal:${rssServer.port}/nasa.xml',
         );
 
diff --git a/packages/nextcloud/test/notes_test.dart b/packages/nextcloud/test/notes_test.dart
index f226b03a..3f00a6b0 100644
--- a/packages/nextcloud/test/notes_test.dart
+++ b/packages/nextcloud/test/notes_test.dart
@@ -3,12 +3,11 @@ import 'package:test/test.dart';
 
 import 'helper.dart';
 
-Future main() async {
-  await run(await getDockerImage());
-}
-
-Future run(final DockerImage image) async {
+void main() {
   group('notes', () {
+    late DockerImage image;
+    setUpAll(() async => image = await getDockerImage());
+
     late DockerContainer container;
     late TestNextcloudClient client;
     setUp(() async {
diff --git a/packages/nextcloud/test/notifications_test.dart b/packages/nextcloud/test/notifications_test.dart
index 414709f1..1f3b34e6 100644
--- a/packages/nextcloud/test/notifications_test.dart
+++ b/packages/nextcloud/test/notifications_test.dart
@@ -5,12 +5,11 @@ import 'package:test/test.dart';
 
 import 'helper.dart';
 
-Future main() async {
-  await run(await getDockerImage());
-}
-
-Future run(final DockerImage image) async {
+void main() {
   group('notifications', () {
+    late DockerImage image;
+    setUpAll(() async => image = await getDockerImage());
+
     late DockerContainer container;
     late TestNextcloudClient client;
     setUp(() async {
@@ -99,6 +98,9 @@ Future run(final DockerImage image) async {
   });
 
   group('push notifications', () {
+    late DockerImage image;
+    setUpAll(() async => image = await getDockerImage());
+
     late DockerContainer container;
     late TestNextcloudClient client;
     setUp(() async {
diff --git a/packages/nextcloud/test/provisioning_api_test.dart b/packages/nextcloud/test/provisioning_api_test.dart
index ea8587df..26d6b963 100644
--- a/packages/nextcloud/test/provisioning_api_test.dart
+++ b/packages/nextcloud/test/provisioning_api_test.dart
@@ -2,12 +2,11 @@ import 'package:test/test.dart';
 
 import 'helper.dart';
 
-Future main() async {
-  await run(await getDockerImage());
-}
-
-Future run(final DockerImage image) async {
+void main() {
   group('provisioning_api', () {
+    late DockerImage image;
+    setUpAll(() async => image = await getDockerImage());
+
     late DockerContainer container;
     late TestNextcloudClient client;
     setUp(() async {
diff --git a/packages/nextcloud/test/uppush_test.dart b/packages/nextcloud/test/uppush_test.dart
index 02a4c11b..5da10188 100644
--- a/packages/nextcloud/test/uppush_test.dart
+++ b/packages/nextcloud/test/uppush_test.dart
@@ -2,12 +2,11 @@ import 'package:test/test.dart';
 
 import 'helper.dart';
 
-Future main() async {
-  await run(await getDockerImage());
-}
-
-Future run(final DockerImage image) async {
+void main() {
   group('uppush', () {
+    late DockerImage image;
+    setUpAll(() async => image = await getDockerImage());
+
     late DockerContainer container;
     late TestNextcloudClient client;
     setUp(() async {
diff --git a/packages/nextcloud/test/user_status_test.dart b/packages/nextcloud/test/user_status_test.dart
index d079ab8d..435c43d1 100644
--- a/packages/nextcloud/test/user_status_test.dart
+++ b/packages/nextcloud/test/user_status_test.dart
@@ -3,12 +3,11 @@ import 'package:test/test.dart';
 
 import 'helper.dart';
 
-Future main() async {
-  await run(await getDockerImage());
-}
-
-Future run(final DockerImage image) async {
+void main() {
   group('user_status', () {
+    late DockerImage image;
+    setUpAll(() async => image = await getDockerImage());
+
     late DockerContainer container;
     late TestNextcloudClient client;
     setUp(() async {
diff --git a/packages/nextcloud/test/webdav_test.dart b/packages/nextcloud/test/webdav_test.dart
index 0ab3632a..b1f72880 100644
--- a/packages/nextcloud/test/webdav_test.dart
+++ b/packages/nextcloud/test/webdav_test.dart
@@ -7,12 +7,11 @@ import 'package:test/test.dart';
 
 import 'helper.dart';
 
-Future main() async {
-  await run(await getDockerImage());
-}
-
-Future run(final DockerImage image) async {
+void main() {
   group('webdav', () {
+    late DockerImage image;
+    setUpAll(() async => image = await getDockerImage());
+
     late DockerContainer container;
     late TestNextcloudClient client;
     setUp(() async {