diff --git a/packages/nextcloud/test/core_test.dart b/packages/nextcloud/test/core_test.dart
index 18289abe..9f864c62 100644
--- a/packages/nextcloud/test/core_test.dart
+++ b/packages/nextcloud/test/core_test.dart
@@ -1,14 +1,16 @@
+@Retry(3)
+library core_test;
+
 import 'package:nextcloud/nextcloud.dart';
 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..22e0ee6f 100644
--- a/packages/nextcloud/test/news_test.dart
+++ b/packages/nextcloud/test/news_test.dart
@@ -1,3 +1,6 @@
+@Retry(3)
+library news_test;
+
 import 'dart:async';
 import 'dart:io';
 
@@ -6,15 +9,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 +27,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..b78b11fe 100644
--- a/packages/nextcloud/test/notes_test.dart
+++ b/packages/nextcloud/test/notes_test.dart
@@ -1,14 +1,16 @@
+@Retry(3)
+library notes_test;
+
 import 'package:nextcloud/nextcloud.dart';
 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..8eba1e9a 100644
--- a/packages/nextcloud/test/notifications_test.dart
+++ b/packages/nextcloud/test/notifications_test.dart
@@ -1,3 +1,6 @@
+@Retry(3)
+library notifications_test;
+
 import 'dart:async';
 
 import 'package:nextcloud/nextcloud.dart';
@@ -5,12 +8,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 +101,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..9383e9f7 100644
--- a/packages/nextcloud/test/provisioning_api_test.dart
+++ b/packages/nextcloud/test/provisioning_api_test.dart
@@ -1,13 +1,15 @@
+@Retry(3)
+library provisioning_api_test;
+
 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..7393ff9b 100644
--- a/packages/nextcloud/test/uppush_test.dart
+++ b/packages/nextcloud/test/uppush_test.dart
@@ -1,13 +1,15 @@
+@Retry(3)
+library uppush_test;
+
 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..663c359b 100644
--- a/packages/nextcloud/test/user_status_test.dart
+++ b/packages/nextcloud/test/user_status_test.dart
@@ -1,14 +1,16 @@
+@Retry(3)
+library user_status_test;
+
 import 'package:nextcloud/nextcloud.dart';
 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..25396a30 100644
--- a/packages/nextcloud/test/webdav_test.dart
+++ b/packages/nextcloud/test/webdav_test.dart
@@ -1,3 +1,6 @@
+@Retry(3)
+library webdav_test;
+
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
@@ -7,12 +10,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 {