diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9034d1db..715800c8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,43 +27,101 @@ jobs:
     name: Check for changes
     runs-on: ubuntu-latest
     outputs:
-      # Expose matched filters as job 'tags' output variable
-      tags: ${{ steps.filter.outputs.changes }}
+      changes: ${{ steps.changed_files.outputs.any_modified }}
+      tags: ${{ steps.list.outputs.tags }}
     steps:
+      - name: Install Nextflow
+        uses: nf-core/setup-nextflow@v1
+
+      - name: Cache nf-test installation
+        id: cache-software
+        uses: actions/cache@v3
+        with:
+          path: |
+            /usr/local/bin/nf-test
+            /home/runner/.nf-test/nf-test.jar
+          key: ${{ runner.os }}-${{ env.NFT_VER }}-nftest
+
+      - name: Install nf-test
+        if: steps.cache-software.outputs.cache-hit != 'true'
+        run: |
+          wget -qO- https://code.askimed.com/install/nf-test | bash
+          sudo mv nf-test /usr/local/bin/
+
       - uses: actions/checkout@v3
-      - name: Combine all tags.yml files
-        id: get_username
-        run: find . -name "tags.yml" -not -path "./.github/*" -exec cat {} + > .github/tags.yml
-      - name: debug
-        run: cat .github/tags.yml
-      - uses: dorny/paths-filter@v2
-        id: filter
         with:
-          filters: ".github/tags.yml"
+          fetch-depth: 0
 
-  define_nxf_versions:
-    name: Choose nextflow versions to test against depending on target branch
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.nxf_versions.outputs.matrix }}
-    steps:
-      - id: nxf_versions
+      - uses: tj-actions/changed-files@v42
+        id: changed_files
+        with:
+          dir_names: "true"
+          output_renamed_files_as_deleted_and_added: "true"
+          # Define list of additional rules for testing paths
+          # Mostly, we define additional 'pipeline' or 'all' tests here
+          files_yaml: |
+            ".":
+              - .github/workflows/**
+              - nf-test.config
+              - nextflow.config
+            tests:
+              - assets/*
+              - bin/*
+              - conf/*
+              - main.nf
+              - nextflow_schema.json
+
+          files_ignore: |
+            .git*
+            .gitpod.yml
+            .prettierignore
+            .prettierrc.yml
+            **.md
+            **.png
+            modules.json
+            pyproject.toml
+            tower.yml
+
+      - name: debug
         run: |
-          if [[ "${{ github.event_name }}" == "pull_request" && "${{ github.base_ref }}" == "dev" && "${{ matrix.NXF_VER }}" != "latest-everything" ]]; then
-            echo matrix='["latest-everything"]' | tee -a $GITHUB_OUTPUT
-          else
-            echo matrix='["latest-everything", "23.04.0"]' | tee -a $GITHUB_OUTPUT
-          fi
+          echo ${{ steps.changed_files.outputs.any_modified }}
+          echo ${{ steps.changed_files.outputs.all_changed_files }}
+          echo ${{ steps.changed_files.outputs.changed_keys }}
+
+      - name: nf-test list tags
+        id: list
+        if: ${{ steps.changed_files.outputs.any_modified }}
+        run: echo tags=$(nf-test list --silent --tags --format json ${{ steps.changed_files.outputs.all_changed_files }} ${{ steps.changed_files.outputs.changed_keys }}) >> $GITHUB_OUTPUT
+
+      - name: debug2
+        run: |
+          echo ${{ steps.list.outputs.tags }}
+
+  # define_nxf_versions:
+  #   name: Choose nextflow versions to test against depending on target branch
+  #   runs-on: ubuntu-latest
+  #   outputs:
+  #     matrix: ${{ steps.nxf_versions.outputs.matrix }}
+  #   steps:
+  #     - id: nxf_versions
+  #       run: |
+  #         if [[ "${{ github.event_name }}" == "pull_request" && "${{ github.base_ref }}" == "dev" && "${{ matrix.NXF_VER }}" != "latest-everything" ]]; then
+  #           echo matrix='["latest-everything"]' | tee -a $GITHUB_OUTPUT
+  #         else
+  #           echo matrix='["latest-everything", "23.04.0"]' | tee -a $GITHUB_OUTPUT
+  #         fi
 
   test:
-    name: ${{ matrix.tags }} ${{ matrix.profile }} NF ${{ matrix.NXF_VER }}
-    needs: [changes, define_nxf_versions]
-    if: needs.changes.outputs.tags != '[]'
+    name: ${{ matrix.tags }} ${{ matrix.profile }} NF-${{ matrix.NXF_VER }}
+    needs: [changes]
+    if: needs.changes.outputs.changes
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        NXF_VER: ${{ fromJson(needs.define_nxf_versions.outputs.matrix) }}
+        NXF_VER:
+          - "latest-everything"
+          - "23.04"
         tags: ["${{ fromJson(needs.changes.outputs.tags) }}"]
         profile:
           - "docker"
@@ -122,3 +180,21 @@ jobs:
         if: always() # always run even if the previous step fails
         with:
           report_paths: test.xml
+
+  confirm-pass:
+    runs-on: ubuntu-latest
+    needs: [test]
+    if: always()
+    steps:
+      - name: All tests ok
+        if: ${{ success() || !contains(needs.*.result, 'failure') }}
+        run: exit 0
+      - name: One or more tests failed
+        if: ${{ contains(needs.*.result, 'failure') }}
+        run: exit 1
+
+      - name: debug-print
+        if: always()
+        run: |
+          echo "toJSON(needs) = ${{ toJSON(needs) }}"
+          echo "toJSON(needs.*.result) = ${{ toJSON(needs.*.result) }}"
diff --git a/modules/local/multiqc_mappings_config/tests/main.nf.test b/modules/local/multiqc_mappings_config/tests/main.nf.test
index cfb43166..e782116e 100644
--- a/modules/local/multiqc_mappings_config/tests/main.nf.test
+++ b/modules/local/multiqc_mappings_config/tests/main.nf.test
@@ -3,9 +3,8 @@ nextflow_process {
     name "Test process: MULTIQC_MAPPINGS_CONFIG"
     script "../main.nf"
     process "MULTIQC_MAPPINGS_CONFIG"
-    tag "modules"
-    tag "modules_local"
-    tag "multiqc_mappings_config"
+
+    tag "MULTIQC_MAPPINGS_CONFIG"
 
     test("Should run without failures") {
 
diff --git a/modules/local/multiqc_mappings_config/tests/tags.yml b/modules/local/multiqc_mappings_config/tests/tags.yml
deleted file mode 100644
index 595e2e31..00000000
--- a/modules/local/multiqc_mappings_config/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-multiqc_mappings_config:
-  - modules/local/multiqc_mappings_config/**
diff --git a/modules/local/sra_fastq_ftp/tests/main.nf.test b/modules/local/sra_fastq_ftp/tests/main.nf.test
index 33f4be9f..27329cd9 100644
--- a/modules/local/sra_fastq_ftp/tests/main.nf.test
+++ b/modules/local/sra_fastq_ftp/tests/main.nf.test
@@ -3,9 +3,8 @@ nextflow_process {
     name "Test process: SRA_FASTQ_FTP"
     script "../main.nf"
     process "SRA_FASTQ_FTP"
-    tag "modules"
-    tag "modules_local"
-    tag "sra_fastq_ftp"
+
+    tag "SRA_FASTQ_FTP"
 
     test("Should run without failures") {
 
diff --git a/modules/local/sra_fastq_ftp/tests/tags.yml b/modules/local/sra_fastq_ftp/tests/tags.yml
deleted file mode 100644
index e7474bef..00000000
--- a/modules/local/sra_fastq_ftp/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sra_fastq_ftp:
-  - modules/local/sra_fastq_ftp/**
diff --git a/modules/local/sra_ids_to_runinfo/tests/main.nf.test b/modules/local/sra_ids_to_runinfo/tests/main.nf.test
index 087f9069..cc0d6de9 100644
--- a/modules/local/sra_ids_to_runinfo/tests/main.nf.test
+++ b/modules/local/sra_ids_to_runinfo/tests/main.nf.test
@@ -3,9 +3,8 @@ nextflow_process {
     name "Test process: SRA_IDS_TO_RUNINFO"
     script "../main.nf"
     process "SRA_IDS_TO_RUNINFO"
-    tag "modules"
-    tag "modules_local"
-    tag "sra_ids_to_runinfo"
+
+    tag "SRA_IDS_TO_RUNINFO"
 
     test("Should run without failures") {
 
diff --git a/modules/local/sra_ids_to_runinfo/tests/tags.yml b/modules/local/sra_ids_to_runinfo/tests/tags.yml
deleted file mode 100644
index 63ea7db3..00000000
--- a/modules/local/sra_ids_to_runinfo/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sra_ids_to_runinfo:
-  - modules/local/sra_ids_to_runinfo/**
diff --git a/modules/local/sra_runinfo_to_ftp/tests/main.nf.test b/modules/local/sra_runinfo_to_ftp/tests/main.nf.test
index 347e3392..1060b394 100644
--- a/modules/local/sra_runinfo_to_ftp/tests/main.nf.test
+++ b/modules/local/sra_runinfo_to_ftp/tests/main.nf.test
@@ -3,9 +3,8 @@ nextflow_process {
     name "Test process: SRA_RUNINFO_TO_FTP"
     script "../main.nf"
     process "SRA_RUNINFO_TO_FTP"
-    tag "modules"
-    tag "modules_local"
-    tag "sra_runinfo_to_ftp"
+
+    tag "SRA_RUNINFO_TO_FTP"
 
     test("Should run without failures") {
 
diff --git a/modules/local/sra_runinfo_to_ftp/tests/tags.yml b/modules/local/sra_runinfo_to_ftp/tests/tags.yml
deleted file mode 100644
index 0987a1e6..00000000
--- a/modules/local/sra_runinfo_to_ftp/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sra_runinfo_to_ftp:
-  - modules/local/sra_runinfo_to_ftp/**
diff --git a/modules/local/sra_to_samplesheet/tests/main.nf.test b/modules/local/sra_to_samplesheet/tests/main.nf.test
index 6094717b..999864b8 100644
--- a/modules/local/sra_to_samplesheet/tests/main.nf.test
+++ b/modules/local/sra_to_samplesheet/tests/main.nf.test
@@ -3,9 +3,8 @@ nextflow_process {
     name "Test process: SRA_TO_SAMPLESHEET"
     script "../main.nf"
     process "SRA_TO_SAMPLESHEET"
-    tag "modules"
-    tag "modules_local"
-    tag "sra_to_samplesheet"
+
+    tag "SRA_TO_SAMPLESHEET"
 
     test("Should run without failures") {
 
diff --git a/modules/local/sra_to_samplesheet/tests/tags.yml b/modules/local/sra_to_samplesheet/tests/tags.yml
deleted file mode 100644
index 2f2d527b..00000000
--- a/modules/local/sra_to_samplesheet/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sra_to_samplesheet:
-  - modules/local/sra_to_samplesheet/**
diff --git a/modules/nf-core/custom/sratoolsncbisettings/tests/main.nf.test b/modules/nf-core/custom/sratoolsncbisettings/tests/main.nf.test
index 9f178678..6fde77c6 100644
--- a/modules/nf-core/custom/sratoolsncbisettings/tests/main.nf.test
+++ b/modules/nf-core/custom/sratoolsncbisettings/tests/main.nf.test
@@ -4,10 +4,8 @@ nextflow_process {
     script "../main.nf"
     process "CUSTOM_SRATOOLSNCBISETTINGS"
     config "modules/nf-core/custom/sratoolsncbisettings/tests/nextflow.config"
-    tag "modules"
-    tag "modules_nfcore"
-    tag "custom"
-    tag "custom/sratoolsncbisettings"
+
+    tag "CUSTOM_SRATOOLSNCBISETTINGS"
 
     test("Should run without failures") {
 
diff --git a/modules/nf-core/custom/sratoolsncbisettings/tests/tags.yml b/modules/nf-core/custom/sratoolsncbisettings/tests/tags.yml
deleted file mode 100644
index fb4a08a7..00000000
--- a/modules/nf-core/custom/sratoolsncbisettings/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-custom/sratoolsncbisettings:
-  - modules/nf-core/custom/sratoolsncbisettings/**
diff --git a/modules/nf-core/sratools/fasterqdump/tests/main.nf.test b/modules/nf-core/sratools/fasterqdump/tests/main.nf.test
index 48722e4e..b3107336 100644
--- a/modules/nf-core/sratools/fasterqdump/tests/main.nf.test
+++ b/modules/nf-core/sratools/fasterqdump/tests/main.nf.test
@@ -3,11 +3,9 @@ nextflow_process {
     script "../main.nf"
     config "./nextflow.config"
     process "SRATOOLS_FASTERQDUMP"
-    tag "modules"
-    tag "modules_nfcore"
-    tag "untar"
-    tag "sratools"
-    tag "sratools/fasterqdump"
+    tag "SRATOOLS_FASTERQDUMP"
+
+    tag "UNTAR"
 
     test("Single-end") {
 
diff --git a/modules/nf-core/sratools/fasterqdump/tests/tags.yml b/modules/nf-core/sratools/fasterqdump/tests/tags.yml
deleted file mode 100644
index 5d1ddcb3..00000000
--- a/modules/nf-core/sratools/fasterqdump/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sratools/fasterqdump:
-  - modules/nf-core/sratools/fasterqdump/**
diff --git a/modules/nf-core/sratools/prefetch/tests/main.nf.test b/modules/nf-core/sratools/prefetch/tests/main.nf.test
index ed710ba0..7319108c 100644
--- a/modules/nf-core/sratools/prefetch/tests/main.nf.test
+++ b/modules/nf-core/sratools/prefetch/tests/main.nf.test
@@ -2,10 +2,7 @@ nextflow_process {
     name "Test Process SRATOOLS_PREFETCH"
     script "../main.nf"
     process "SRATOOLS_PREFETCH"
-    tag "modules"
-    tag "modules_nfcore"
-    tag "sratools"
-    tag "sratools/prefetch"
+    tag "SRATOOLS_PREFETCH"
 
     test("sratools/prefetch") {
 
diff --git a/modules/nf-core/sratools/prefetch/tests/tags.yml b/modules/nf-core/sratools/prefetch/tests/tags.yml
deleted file mode 100644
index 52110bfd..00000000
--- a/modules/nf-core/sratools/prefetch/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sratools/prefetch:
-  - modules/nf-core/sratools/prefetch/**
diff --git a/modules/nf-core/untar/tests/main.nf.test b/modules/nf-core/untar/tests/main.nf.test
index 679e83c7..0eb25d3c 100644
--- a/modules/nf-core/untar/tests/main.nf.test
+++ b/modules/nf-core/untar/tests/main.nf.test
@@ -3,10 +3,7 @@ nextflow_process {
     name "Test Process UNTAR"
     script "../main.nf"
     process "UNTAR"
-
-    tag "modules"
-    tag "modules_nfcore"
-    tag "untar"
+    tag "UNTAR"
 
     test("test_untar") {
 
diff --git a/modules/nf-core/untar/tests/tags.yml b/modules/nf-core/untar/tests/tags.yml
deleted file mode 100644
index feb6f15c..00000000
--- a/modules/nf-core/untar/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-untar:
-  - modules/nf-core/untar/**
diff --git a/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/main.function.nf.test b/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/main.function.nf.test
index 7b3ab592..5e5d3a62 100644
--- a/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/main.function.nf.test
+++ b/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/main.function.nf.test
@@ -3,9 +3,7 @@ nextflow_function {
 
     name "Test Functions"
     script "subworkflows/local/utils_nfcore_fetchngs_pipeline/main.nf"
-    tag 'subworkflows'
-    tag 'utils_nfcore_fetchngs_pipeline'
-    tag 'subworkflows/utils_nfcore_fetchngs_pipeline'
+    tag "UTILS_NFCORE_FETCHNGS_PIPELINE"
 
     test("Function isSraId") {
 
diff --git a/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/main.workflow_pipeline_completion.test b/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/main.workflow_pipeline_completion.test
index 16f11e8f..a1814bf6 100644
--- a/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/main.workflow_pipeline_completion.test
+++ b/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/main.workflow_pipeline_completion.test
@@ -3,9 +3,7 @@ nextflow_workflow {
     name "Test Workflow PIPELINE_COMPLETION"
     script "subworkflows/local/utils_nfcore_fetchngs_pipeline/main.nf"
     workflow "PIPELINE_COMPLETION"
-    tag 'subworkflows'
-    tag 'utils_nfcore_fetchngs_pipeline'
-    tag 'subworkflows/utils_nfcore_fetchngs_pipeline'
+    tag "PIPELINE_COMPLETION"
 
     test("Should run") {
 
diff --git a/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/main.workflow_pipeline_initialisation.nf.test b/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/main.workflow_pipeline_initialisation.nf.test
index 035ecfd3..d8dc3963 100644
--- a/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/main.workflow_pipeline_initialisation.nf.test
+++ b/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/main.workflow_pipeline_initialisation.nf.test
@@ -3,9 +3,7 @@ nextflow_workflow {
     name "Test Workflow PIPELINE_INITIALISATION"
     script "subworkflows/local/utils_nfcore_fetchngs_pipeline/main.nf"
     workflow "PIPELINE_INITIALISATION"
-    tag 'subworkflows'
-    tag 'utils_nfcore_fetchngs_pipeline'
-    tag 'subworkflows/utils_nfcore_fetchngs_pipeline'
+    tag 'PIPELINE_INITIALISATION'
 
     test("Should run") {
 
diff --git a/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/tags.yml b/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/tags.yml
deleted file mode 100644
index 944508d1..00000000
--- a/subworkflows/local/utils_nfcore_fetchngs_pipeline/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-subworkflows/utils_nfcore_fetchngs_pipeline:
-  - subworkflows/local/utils_nfcore_fetchngs_pipeline/**
diff --git a/subworkflows/nf-core/fastq_download_prefetch_fasterqdump_sratools/tests/main.nf.test b/subworkflows/nf-core/fastq_download_prefetch_fasterqdump_sratools/tests/main.nf.test
index 2a16d1ef..2f1d0835 100644
--- a/subworkflows/nf-core/fastq_download_prefetch_fasterqdump_sratools/tests/main.nf.test
+++ b/subworkflows/nf-core/fastq_download_prefetch_fasterqdump_sratools/tests/main.nf.test
@@ -3,12 +3,11 @@ nextflow_workflow {
     name "Test workflow: fastq_download_prefetch_fasterqdump_sratools/main.nf"
     script "../main.nf"
     workflow "FASTQ_DOWNLOAD_PREFETCH_FASTERQDUMP_SRATOOLS"
-    tag "subworkflows"
-    tag "subworkflows_nfcore"
-    tag "custom/sratoolsncbisettings"
-    tag "sratools/prefetch"
-    tag "sratools/fasterqdump"
-    tag "subworkflows/fastq_download_prefetch_fasterqdump_sratools"
+    tag "FASTQ_DOWNLOAD_PREFETCH_FASTERQDUMP_SRATOOLS"
+    
+    tag "CUSTOM_SRATOOLSNCBISETTINGS"
+    tag "SRATOOLS_PREFETCH"
+    tag "SRATOOLS_FASTERQDUMP"
 
     test("Parameters: default") {
 
diff --git a/subworkflows/nf-core/fastq_download_prefetch_fasterqdump_sratools/tests/tags.yml b/subworkflows/nf-core/fastq_download_prefetch_fasterqdump_sratools/tests/tags.yml
deleted file mode 100644
index 03028c32..00000000
--- a/subworkflows/nf-core/fastq_download_prefetch_fasterqdump_sratools/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-subworkflows/fastq_download_prefetch_fasterqdump_sratools:
-  - subworkflows/nf-core/fastq_download_prefetch_fasterqdump_sratools/**
diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.functions.nf.test b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.functions.nf.test
index 9b18004b..81f5ba45 100644
--- a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.functions.nf.test
+++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.functions.nf.test
@@ -4,9 +4,8 @@ nextflow_function {
     name "Test Functions"
     script "subworkflows/nf-core/utils_nextflow_pipeline/main.nf"
     config "subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config"
-    tag 'subworkflows'
-    tag 'utils_nextflow_pipeline'
-    tag 'subworkflows/utils_nextflow_pipeline'
+
+    tag "UTILS_NEXTFLOW_PIPELINE"
 
     test("Test Function getWorkflowVersion") {
 
diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test
index e2fa5b6c..3298fffe 100644
--- a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test
+++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test
@@ -4,9 +4,7 @@ nextflow_workflow {
     script "../main.nf"
     config "subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config"
     workflow "UTILS_NEXTFLOW_PIPELINE"
-    tag 'subworkflows'
-    tag 'utils_nextflow_pipeline'
-    tag 'subworkflows/utils_nextflow_pipeline'
+    tag "UTILS_NEXTFLOW_PIPELINE"
 
     test("Should run no inputs") {
 
diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/tags.yml b/subworkflows/nf-core/utils_nextflow_pipeline/tests/tags.yml
deleted file mode 100644
index f8476112..00000000
--- a/subworkflows/nf-core/utils_nextflow_pipeline/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-subworkflows/utils_nextflow_pipeline:
-  - subworkflows/nf-core/utils_nextflow_pipeline/**
diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test
index f57980c7..6176bb55 100644
--- a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test
+++ b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test
@@ -4,10 +4,8 @@ nextflow_function {
     name "Test Functions"
     script "../main.nf"
     config "subworkflows/nf-core/utils_nfcore_pipeline/tests/nextflow.config"
-    tag "subworkflows"
-    tag "subworkflows_nfcore"
-    tag "utils_nfcore_pipeline"
-    tag "subworkflows/utils_nfcore_pipeline"
+
+    tag "UTILS_NFCORE_PIPELINE"
 
     test("Test Function checkConfigProvided") {
 
diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test
index b16445da..de513d78 100644
--- a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test
+++ b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test
@@ -4,10 +4,8 @@ nextflow_workflow {
     script "../main.nf"
     config "subworkflows/nf-core/utils_nfcore_pipeline/tests/nextflow.config"
     workflow "UTILS_NFCORE_PIPELINE"
-    tag "subworkflows"
-    tag "subworkflows_nfcore"
-    tag "utils_nfcore_pipeline"
-    tag "subworkflows/utils_nfcore_pipeline"
+    
+    tag "UTILS_NFCORE_PIPELINE"
 
     test("Should run without failures") {
         then {
diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/tags.yml b/subworkflows/nf-core/utils_nfcore_pipeline/tests/tags.yml
deleted file mode 100644
index ac8523c9..00000000
--- a/subworkflows/nf-core/utils_nfcore_pipeline/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-subworkflows/utils_nfcore_pipeline:
-  - subworkflows/nf-core/utils_nfcore_pipeline/**
diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test
index 904f97be..b64a5106 100644
--- a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test
+++ b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test
@@ -3,12 +3,7 @@ nextflow_workflow {
     name "Test Workflow UTILS_NFVALIDATION_PLUGIN"
     script "../main.nf"
     workflow "UTILS_NFVALIDATION_PLUGIN"
-    tag "subworkflows"
-    tag "subworkflows_nfcore"
-    tag "plugin/nf-validation"
-    tag "'plugin/nf-validation'"
-    tag "utils_nfvalidation_plugin"
-    tag "subworkflows/utils_nfvalidation_plugin"
+    tag "UTILS_NFVALIDATION_PLUGIN"
 
     test("Should run nothing") {
 
diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/tags.yml b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/tags.yml
deleted file mode 100644
index 60b1cfff..00000000
--- a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/tags.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-subworkflows/utils_nfvalidation_plugin:
-  - subworkflows/nf-core/utils_nfvalidation_plugin/**
diff --git a/tests/main.nf.test b/tests/main.nf.test
index 3c36cd06..dc3662cd 100644
--- a/tests/main.nf.test
+++ b/tests/main.nf.test
@@ -2,8 +2,7 @@ nextflow_pipeline {
 
     name "Test pipeline"
     script "../main.nf"
-    tag "pipeline"
-    tag "pipeline_fetchngs"
+    tag "PIPELINE"
 
     test("Run with profile test") {
 
diff --git a/tests/tags.yml b/tests/tags.yml
deleted file mode 100644
index 80e5fd75..00000000
--- a/tests/tags.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-pipeline_fetchngs:
-  - "**.nf"
-  - "**.config"
-  - "**.nf.test"
-  - "**.json"
diff --git a/workflows/sra/tests/main.nf.test b/workflows/sra/tests/main.nf.test
index 902debe6..8fcd0e47 100644
--- a/workflows/sra/tests/main.nf.test
+++ b/workflows/sra/tests/main.nf.test
@@ -3,10 +3,15 @@ nextflow_workflow {
     name "Test workflow: sra/main.nf"
     script "../main.nf"
     workflow "SRA"
-    tag "workflows"
-    tag "workflows_sra"
-    tag "multiqc_mappings_config"
-    tag "sra_default_parameters"
+    tag "SRA"
+
+    // Dependencies
+    tag "MULTIQC_MAPPINGS_CONFIG"
+    tag "SRA_FASTQ_FTP"
+    tag "SRA_IDS_TO_RUNINFO"
+    tag "SRA_RUNINFO_TO_FTP"
+    tag "SRA_TO_SAMPLESHEET"
+
 
     test("Parameters: default") {
 
diff --git a/workflows/sra/tests/sra_custom_ena_metadata_fields.nf.test b/workflows/sra/tests/sra_custom_ena_metadata_fields.nf.test
index 433288f9..0724b4fb 100644
--- a/workflows/sra/tests/sra_custom_ena_metadata_fields.nf.test
+++ b/workflows/sra/tests/sra_custom_ena_metadata_fields.nf.test
@@ -3,10 +3,16 @@ nextflow_workflow {
     name "Test workflow: sra/main.nf"
     script "../main.nf"
     workflow "SRA"
-    tag "workflows"
-    tag "workflows_sra"
-    tag "multiqc_mappings_config"
-    tag "sra_custom_ena_metadata_fields"
+
+    // Subworkflows
+    tag "SRA"
+
+    // Modules
+    tag "MULTIQC_MAPPINGS_CONFIG"
+    tag "SRA_FASTQ_FTP"
+    tag "SRA_IDS_TO_RUNINFO"
+    tag "SRA_RUNINFO_TO_FTP"
+    tag "SRA_TO_SAMPLESHEET"
 
     test("Parameters: --nf_core_pipeline rnaseq --ena_metadata_fields ... --sample_mapping_fields ...") {
 
diff --git a/workflows/sra/tests/sra_force_sratools_download.nf.test b/workflows/sra/tests/sra_force_sratools_download.nf.test
index 2019be08..2d01c694 100644
--- a/workflows/sra/tests/sra_force_sratools_download.nf.test
+++ b/workflows/sra/tests/sra_force_sratools_download.nf.test
@@ -3,10 +3,16 @@ nextflow_workflow {
     name "Test workflow: sra/main.nf"
     script "../main.nf"
     workflow "SRA"
-    tag "workflows"
-    tag "workflows_sra"
-    tag "multiqc_mappings_config"
-    tag "sra_force_sratools_download"
+
+    // Subworkflows
+    tag "SRA"
+
+    // Modules
+    tag "MULTIQC_MAPPINGS_CONFIG"
+    tag "SRA_FASTQ_FTP"
+    tag "SRA_IDS_TO_RUNINFO"
+    tag "SRA_RUNINFO_TO_FTP"
+    tag "SRA_TO_SAMPLESHEET"
 
     test("Parameters: --force_sratools_download") {
 
diff --git a/workflows/sra/tests/sra_nf_core_pipeline_atacseq.nf.test b/workflows/sra/tests/sra_nf_core_pipeline_atacseq.nf.test
index 46e4eed8..d792e09f 100644
--- a/workflows/sra/tests/sra_nf_core_pipeline_atacseq.nf.test
+++ b/workflows/sra/tests/sra_nf_core_pipeline_atacseq.nf.test
@@ -3,10 +3,16 @@ nextflow_workflow {
     name "Test workflow: sra/main.nf"
     script "../main.nf"
     workflow "SRA"
-    tag "workflows"
-    tag "workflows_sra"
-    tag "multiqc_mappings_config"
-    tag "sra_nf_core_pipeline_atacseq"
+    
+    // Subworkflows
+    tag "SRA"
+
+    // Modules
+    tag "MULTIQC_MAPPINGS_CONFIG"
+    tag "SRA_FASTQ_FTP"
+    tag "SRA_IDS_TO_RUNINFO"
+    tag "SRA_RUNINFO_TO_FTP"
+    tag "SRA_TO_SAMPLESHEET"
 
     test("Parameters: --nf_core_pipeline atacseq") {
 
diff --git a/workflows/sra/tests/sra_nf_core_pipeline_rnaseq.nf.test b/workflows/sra/tests/sra_nf_core_pipeline_rnaseq.nf.test
index f24d2648..7f2603f6 100644
--- a/workflows/sra/tests/sra_nf_core_pipeline_rnaseq.nf.test
+++ b/workflows/sra/tests/sra_nf_core_pipeline_rnaseq.nf.test
@@ -3,10 +3,16 @@ nextflow_workflow {
     name "Test workflow: sra/main.nf"
     script "../main.nf"
     workflow "SRA"
-    tag "workflows"
-    tag "workflows_sra"
-    tag "multiqc_mappings_config"
-    tag "sra_nf_core_pipeline_rnaseq"
+
+    // Subworkflows
+    tag "SRA"
+
+    // Modules
+    tag "MULTIQC_MAPPINGS_CONFIG"
+    tag "SRA_FASTQ_FTP"
+    tag "SRA_IDS_TO_RUNINFO"
+    tag "SRA_RUNINFO_TO_FTP"
+    tag "SRA_TO_SAMPLESHEET"
 
     test("Parameters: --nf_core_pipeline rnaseq") {
 
diff --git a/workflows/sra/tests/sra_nf_core_pipeline_taxprofiler.nf.test b/workflows/sra/tests/sra_nf_core_pipeline_taxprofiler.nf.test
index 447e8c6e..7d4fcb23 100644
--- a/workflows/sra/tests/sra_nf_core_pipeline_taxprofiler.nf.test
+++ b/workflows/sra/tests/sra_nf_core_pipeline_taxprofiler.nf.test
@@ -3,10 +3,16 @@ nextflow_workflow {
     name "Test workflow: sra/main.nf"
     script "../main.nf"
     workflow "SRA"
-    tag "workflows"
-    tag "workflows_sra"
-    tag "multiqc_mappings_config"
-    tag "sra_nf_core_pipeline_taxprofiler"
+
+    // Subworkflows
+    tag "SRA"
+
+    // Modules
+    tag "MULTIQC_MAPPINGS_CONFIG"
+    tag "SRA_FASTQ_FTP"
+    tag "SRA_IDS_TO_RUNINFO"
+    tag "SRA_RUNINFO_TO_FTP"
+    tag "SRA_TO_SAMPLESHEET"
 
     test("Parameters: --nf_core_pipeline taxprofiler") {
 
diff --git a/workflows/sra/tests/sra_nf_core_pipeline_viralrecon.nf.test b/workflows/sra/tests/sra_nf_core_pipeline_viralrecon.nf.test
index 9b27c0a5..89f8f370 100644
--- a/workflows/sra/tests/sra_nf_core_pipeline_viralrecon.nf.test
+++ b/workflows/sra/tests/sra_nf_core_pipeline_viralrecon.nf.test
@@ -3,10 +3,16 @@ nextflow_workflow {
     name "Test workflow: sra/main.nf"
     script "../main.nf"
     workflow "SRA"
-    tag "workflows"
-    tag "workflows_sra"
-    tag "multiqc_mappings_config"
-    tag "sra_nf_core_pipeline_viralrecon"
+
+    // Subworkflows
+    tag "SRA"
+
+    // Modules
+    tag "MULTIQC_MAPPINGS_CONFIG"
+    tag "SRA_FASTQ_FTP"
+    tag "SRA_IDS_TO_RUNINFO"
+    tag "SRA_RUNINFO_TO_FTP"
+    tag "SRA_TO_SAMPLESHEET"
 
     test("Parameters: --nf_core_pipeline viralrecon") {
 
diff --git a/workflows/sra/tests/sra_skip_fastq_download.nf.test b/workflows/sra/tests/sra_skip_fastq_download.nf.test
index 1a3ab733..b3fdd883 100644
--- a/workflows/sra/tests/sra_skip_fastq_download.nf.test
+++ b/workflows/sra/tests/sra_skip_fastq_download.nf.test
@@ -3,10 +3,16 @@ nextflow_workflow {
     name "Test workflow: sra/main.nf"
     script "../main.nf"
     workflow "SRA"
-    tag "workflows"
-    tag "workflows_sra"
-    tag "multiqc_mappings_config"
-    tag "sra_skip_fastq_download"
+
+    // Subworkflows
+    tag "SRA"
+
+    // Modules
+    tag "MULTIQC_MAPPINGS_CONFIG"
+    tag "SRA_FASTQ_FTP"
+    tag "SRA_IDS_TO_RUNINFO"
+    tag "SRA_RUNINFO_TO_FTP"
+    tag "SRA_TO_SAMPLESHEET"
 
     test("Parameters: --skip_fastq_download") {
 
diff --git a/workflows/sra/tests/tags.yml b/workflows/sra/tests/tags.yml
deleted file mode 100644
index ae41e37d..00000000
--- a/workflows/sra/tests/tags.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-sra_custom_ena_metadata_fields:
-  - workflows/sra/**
-sra_default_parameters:
-  - workflows/sra/**
-sra_force_sratools_download:
-  - workflows/sra/**
-sra_nf_core_pipeline_atacseq:
-  - workflows/sra/**
-sra_nf_core_pipeline_rnaseq:
-  - workflows/sra/**
-sra_nf_core_pipeline_taxprofiler:
-  - workflows/sra/**
-sra_nf_core_pipeline_viralrecon:
-  - workflows/sra/**
-sra_skip_fastq_download:
-  - workflows/sra/**