diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index d769f5a6..2882d84d 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -101,38 +101,6 @@ jobs:
     needs:
       - job_001
   job_004:
-    name: "all; PKG: packages/nextcloud_test; `dart analyze --fatal-infos .`"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache Pub hosted dependencies
-        uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
-        with:
-          path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/nextcloud_test;commands:analyze_0"
-          restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/nextcloud_test
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable
-            os:ubuntu-latest;pub-cache-hosted
-            os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
-        with:
-          sdk: stable
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-      - id: packages_nextcloud_test_pub_upgrade
-        name: packages/nextcloud_test; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: packages/nextcloud_test
-      - name: "packages/nextcloud_test; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps.packages_nextcloud_test_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/nextcloud_test
-    needs:
-      - job_001
-  job_005:
     name: "all; PKG: packages/sort_box; `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -164,7 +132,7 @@ jobs:
         working-directory: packages/sort_box
     needs:
       - job_001
-  job_006:
+  job_005:
     name: "all; PKG: packages/spec_templates; `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -196,7 +164,7 @@ jobs:
         working-directory: packages/spec_templates
     needs:
       - job_001
-  job_007:
+  job_006:
     name: "all; PKG: packages/dynamite; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
@@ -228,7 +196,7 @@ jobs:
         working-directory: packages/dynamite
     needs:
       - job_001
-  job_008:
+  job_007:
     name: "all; PKG: packages/file_icons; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
@@ -260,7 +228,7 @@ jobs:
         working-directory: packages/file_icons
     needs:
       - job_001
-  job_009:
+  job_008:
     name: "all; PKG: packages/neon; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
@@ -292,7 +260,7 @@ jobs:
         working-directory: packages/neon
     needs:
       - job_001
-  job_010:
+  job_009:
     name: "all; PKG: packages/nextcloud; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
@@ -324,39 +292,7 @@ jobs:
         working-directory: packages/nextcloud
     needs:
       - job_001
-  job_011:
-    name: "all; PKG: packages/nextcloud_test; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache Pub hosted dependencies
-        uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
-        with:
-          path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/nextcloud_test;commands:format"
-          restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/nextcloud_test
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable
-            os:ubuntu-latest;pub-cache-hosted
-            os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
-        with:
-          sdk: stable
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-      - id: packages_nextcloud_test_pub_upgrade
-        name: packages/nextcloud_test; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: packages/nextcloud_test
-      - name: "packages/nextcloud_test; dart format --output=none --set-exit-if-changed --line-length 120 ."
-        run: "dart format --output=none --set-exit-if-changed --line-length 120 ."
-        if: "always() && steps.packages_nextcloud_test_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/nextcloud_test
-    needs:
-      - job_001
-  job_012:
+  job_010:
     name: "all; PKG: packages/settings; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
@@ -388,7 +324,7 @@ jobs:
         working-directory: packages/settings
     needs:
       - job_001
-  job_013:
+  job_011:
     name: "all; PKG: packages/sort_box; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
@@ -420,7 +356,7 @@ jobs:
         working-directory: packages/sort_box
     needs:
       - job_001
-  job_014:
+  job_012:
     name: "all; PKG: packages/spec_templates; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
@@ -452,7 +388,7 @@ jobs:
         working-directory: packages/spec_templates
     needs:
       - job_001
-  job_015:
+  job_013:
     name: "all; PKG: packages/file_icons; `flutter analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -484,7 +420,7 @@ jobs:
         working-directory: packages/file_icons
     needs:
       - job_001
-  job_016:
+  job_014:
     name: "all; PKG: packages/neon; `flutter analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -516,7 +452,7 @@ jobs:
         working-directory: packages/neon
     needs:
       - job_001
-  job_017:
+  job_015:
     name: "all; PKG: packages/settings; `flutter analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -548,7 +484,7 @@ jobs:
         working-directory: packages/settings
     needs:
       - job_001
-  job_018:
+  job_016:
     name: "all; PKG: packages/nextcloud; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -580,7 +516,7 @@ jobs:
         working-directory: packages/nextcloud
     needs:
       - job_001
-  job_019:
+  job_017:
     name: "all; PKG: packages/sort_box; `dart test`"
     runs-on: ubuntu-latest
     steps:
diff --git a/packages/nextcloud/pubspec.yaml b/packages/nextcloud/pubspec.yaml
index e412c8bd..0d546526 100644
--- a/packages/nextcloud/pubspec.yaml
+++ b/packages/nextcloud/pubspec.yaml
@@ -19,10 +19,9 @@ dev_dependencies:
   dynamite:
     path: ../dynamite
   json_serializable: ^6.3.2
-  nextcloud_test:
-    path: ../nextcloud_test
   nit_picking:
     git:
       url: https://github.com/stack11/dart_nit_picking
       ref: 0b2ee0d
+  process_run: ^0.12.5+2
   test: ^1.16.0
diff --git a/packages/nextcloud/test/core.dart b/packages/nextcloud/test/core.dart
index 9b37b425..7eecfb40 100644
--- a/packages/nextcloud/test/core.dart
+++ b/packages/nextcloud/test/core.dart
@@ -1,7 +1,8 @@
 import 'package:nextcloud/nextcloud.dart';
-import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
+import 'helper.dart';
+
 Future main() async {
   await run(await getDockerImage());
 }
diff --git a/packages/nextcloud_test/lib/nextcloud_test.dart b/packages/nextcloud/test/helper.dart
similarity index 100%
rename from packages/nextcloud_test/lib/nextcloud_test.dart
rename to packages/nextcloud/test/helper.dart
diff --git a/packages/nextcloud/test/main_test.dart b/packages/nextcloud/test/main_test.dart
index ea66c7e9..66907429 100644
--- a/packages/nextcloud/test/main_test.dart
+++ b/packages/nextcloud/test/main_test.dart
@@ -1,6 +1,5 @@
-import 'package:nextcloud_test/nextcloud_test.dart';
-
 import 'core.dart' as core;
+import 'helper.dart';
 import 'news.dart' as news;
 import 'notes.dart' as notes;
 import 'notifications.dart' as notifications;
diff --git a/packages/nextcloud/test/news.dart b/packages/nextcloud/test/news.dart
index 47a04a05..7a2b3c7c 100644
--- a/packages/nextcloud/test/news.dart
+++ b/packages/nextcloud/test/news.dart
@@ -1,7 +1,8 @@
 import 'package:nextcloud/nextcloud.dart';
-import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
+import 'helper.dart';
+
 const wikipediaFeedURL = 'https://en.wikipedia.org/w/api.php?action=featuredfeed&feed=featured&feedformat=atom';
 const nasaFeedURL = 'https://www.nasa.gov/rss/dyn/breaking_news.rss';
 
diff --git a/packages/nextcloud/test/notes.dart b/packages/nextcloud/test/notes.dart
index b322d4a5..9b6fed66 100644
--- a/packages/nextcloud/test/notes.dart
+++ b/packages/nextcloud/test/notes.dart
@@ -1,7 +1,8 @@
 import 'package:nextcloud/nextcloud.dart';
-import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
+import 'helper.dart';
+
 Future main() async {
   await run(await getDockerImage());
 }
diff --git a/packages/nextcloud/test/notifications.dart b/packages/nextcloud/test/notifications.dart
index 0d10ee1c..6edf4442 100644
--- a/packages/nextcloud/test/notifications.dart
+++ b/packages/nextcloud/test/notifications.dart
@@ -1,9 +1,10 @@
 import 'dart:async';
 
 import 'package:nextcloud/nextcloud.dart';
-import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
+import 'helper.dart';
+
 Future main() async {
   await run(await getDockerImage());
 }
diff --git a/packages/nextcloud/test/provisioning_api.dart b/packages/nextcloud/test/provisioning_api.dart
index 837c762d..45fdc60c 100644
--- a/packages/nextcloud/test/provisioning_api.dart
+++ b/packages/nextcloud/test/provisioning_api.dart
@@ -1,7 +1,8 @@
 import 'package:nextcloud/nextcloud.dart';
-import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
+import 'helper.dart';
+
 Future main() async {
   await run(await getDockerImage());
 }
diff --git a/packages/nextcloud/test/user_status.dart b/packages/nextcloud/test/user_status.dart
index 40c9bec8..727a251a 100644
--- a/packages/nextcloud/test/user_status.dart
+++ b/packages/nextcloud/test/user_status.dart
@@ -1,7 +1,8 @@
 import 'package:nextcloud/nextcloud.dart';
-import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
+import 'helper.dart';
+
 Future main() async {
   await run(await getDockerImage());
 }
diff --git a/packages/nextcloud/test/webdav.dart b/packages/nextcloud/test/webdav.dart
index b4dde42b..e76e471d 100644
--- a/packages/nextcloud/test/webdav.dart
+++ b/packages/nextcloud/test/webdav.dart
@@ -3,9 +3,10 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:nextcloud/nextcloud.dart';
-import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
+import 'helper.dart';
+
 Future main() async {
   await run(await getDockerImage());
 }
diff --git a/packages/nextcloud_test/.gitignore b/packages/nextcloud_test/.gitignore
deleted file mode 100644
index 65c34dc8..00000000
--- a/packages/nextcloud_test/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Files and directories created by pub.
-.dart_tool/
-.packages
-
-# Conventional directory for build outputs.
-build/
-
-# Omit committing pubspec.lock for library packages; see
-# https://dart.dev/guides/libraries/private-files#pubspeclock.
-pubspec.lock
diff --git a/packages/nextcloud_test/LICENSE b/packages/nextcloud_test/LICENSE
deleted file mode 120000
index 30cff740..00000000
--- a/packages/nextcloud_test/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE
\ No newline at end of file
diff --git a/packages/nextcloud_test/analysis_options.yaml b/packages/nextcloud_test/analysis_options.yaml
deleted file mode 100644
index 962ec479..00000000
--- a/packages/nextcloud_test/analysis_options.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-include: package:nit_picking/dart.yaml
-
-linter:
-  rules:
-    public_member_api_docs: false
\ No newline at end of file
diff --git a/packages/nextcloud_test/mono_pkg.yaml b/packages/nextcloud_test/mono_pkg.yaml
deleted file mode 100644
index 60bc3bfd..00000000
--- a/packages/nextcloud_test/mono_pkg.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-sdk:
-  - stable
-
-stages:
-  - all:
-      - analyze: --fatal-infos .
-      - format: --output=none --set-exit-if-changed --line-length 120 .
diff --git a/packages/nextcloud_test/pubspec.yaml b/packages/nextcloud_test/pubspec.yaml
deleted file mode 100644
index 78ea8701..00000000
--- a/packages/nextcloud_test/pubspec.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: nextcloud_test
-version: 1.0.0
-publish_to: 'none'
-
-environment:
-  sdk: '>=2.19.0 <3.0.0'
-
-dependencies:
-  nextcloud:
-    path: ../nextcloud
-  process_run: ^0.12.3+1
-  test: ^1.16.0
-
-dev_dependencies:
-  nit_picking:
-    git:
-      url: https://github.com/stack11/dart_nit_picking
-      ref: 0b2ee0d