diff --git a/modules/nf-core/picard/mergesamfiles/tests/main.nf.test b/modules/nf-core/picard/mergesamfiles/tests/main.nf.test
new file mode 100644
index 00000000000..7b45f051a43
--- /dev/null
+++ b/modules/nf-core/picard/mergesamfiles/tests/main.nf.test
@@ -0,0 +1,39 @@
+
+nextflow_process {
+
+    name "Test Process PICARD_MERGESAMFILES"
+    script "../main.nf"
+    process "PICARD_MERGESAMFILES"
+
+    tag "modules"
+    tag "modules_nfcore"
+    tag "picard"
+    tag "picard/mergesamfiles"
+
+    test("test-picard-mergesamfiles") {
+        
+        when {
+            process {
+                """
+                input[0] = [ [ id:'test', single_end:false ], // meta map
+				[ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true),
+				file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.single_end.bam', checkIfExists: true), ]
+				]
+
+                """
+            }
+        }
+
+        then {
+            assertAll(
+                { assert process.success },
+                { assert snapshot(
+					bam(process.out.bam[0][1]).getReadsMD5(),
+					process.out.versions
+					).match()
+				}
+            )
+        }
+    }
+    
+}
diff --git a/modules/nf-core/picard/mergesamfiles/tests/main.nf.test.snap b/modules/nf-core/picard/mergesamfiles/tests/main.nf.test.snap
new file mode 100644
index 00000000000..22d2331e46a
--- /dev/null
+++ b/modules/nf-core/picard/mergesamfiles/tests/main.nf.test.snap
@@ -0,0 +1,15 @@
+{
+    "test-picard-mergesamfiles": {
+        "content": [
+            "730da54c088350ff625d34b95e623dca",
+            [
+                "versions.yml:md5,3b5243ec10606330dd11a38fa7c7fa1f"
+            ]
+        ],
+        "meta": {
+            "nf-test": "0.8.4",
+            "nextflow": "24.04.4"
+        },
+        "timestamp": "2024-08-23T10:50:00.555746"
+    }
+}
\ No newline at end of file
diff --git a/tests/config/pytest_modules.yml b/tests/config/pytest_modules.yml
index 530eb7cd45b..480f825d19b 100644
--- a/tests/config/pytest_modules.yml
+++ b/tests/config/pytest_modules.yml
@@ -1112,9 +1112,6 @@ picard/fixmateinformation:
 picard/liftovervcf:
   - modules/nf-core/picard/liftovervcf/**
   - tests/modules/nf-core/picard/liftovervcf/**
-picard/mergesamfiles:
-  - modules/nf-core/picard/mergesamfiles/**
-  - tests/modules/nf-core/picard/mergesamfiles/**
 picard/renamesampleinvcf:
   - modules/nf-core/picard/renamesampleinvcf/**
   - tests/modules/nf-core/picard/renamesampleinvcf/**
diff --git a/tests/modules/nf-core/picard/mergesamfiles/main.nf b/tests/modules/nf-core/picard/mergesamfiles/main.nf
deleted file mode 100644
index 360cfd7ed0d..00000000000
--- a/tests/modules/nf-core/picard/mergesamfiles/main.nf
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env nextflow
-
-nextflow.enable.dsl = 2
-
-include { PICARD_MERGESAMFILES } from '../../../../../modules/nf-core/picard/mergesamfiles/main.nf'
-
-workflow test_picard_mergesamfiles {
-    input = [ [ id:'test', single_end:false ], // meta map
-              [ file(params.test_data['sarscov2']['illumina']['test_paired_end_sorted_bam'], checkIfExists: true),
-                file(params.test_data['sarscov2']['illumina']['test_single_end_bam'], checkIfExists: true), ]
-            ]
-
-    PICARD_MERGESAMFILES ( input )
-}
diff --git a/tests/modules/nf-core/picard/mergesamfiles/nextflow.config b/tests/modules/nf-core/picard/mergesamfiles/nextflow.config
deleted file mode 100644
index 8730f1c4b93..00000000000
--- a/tests/modules/nf-core/picard/mergesamfiles/nextflow.config
+++ /dev/null
@@ -1,5 +0,0 @@
-process {
-
-    publishDir = { "${params.outdir}/${task.process.tokenize(':')[-1].tokenize('_')[0].toLowerCase()}" }
-
-}
diff --git a/tests/modules/nf-core/picard/mergesamfiles/test.yml b/tests/modules/nf-core/picard/mergesamfiles/test.yml
deleted file mode 100644
index 97dc1b785e7..00000000000
--- a/tests/modules/nf-core/picard/mergesamfiles/test.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- name: picard mergesamfiles
-  command: nextflow run ./tests/modules/nf-core/picard/mergesamfiles -entry test_picard_mergesamfiles -c ./tests/config/nextflow.config -c ./tests/modules/nf-core/picard/mergesamfiles/nextflow.config
-  tags:
-    - picard
-    - picard/mergesamfiles
-  files:
-    - path: ./output/picard/test.bam