diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8f0891ffd..5203f668f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 ### Modules
 
 * Update comment style of modules `functions.nf` template file [[#1076](https://github.com/nf-core/tools/issues/1076)]
+* Changed working directory to temporary directory for `nf-core modules create-test-yml` [[#908](https://github.com/nf-core/tools/issues/908)]
 * Use Biocontainers API instead of quayi.io API for `nf-core modules create` [[#875](https://github.com/nf-core/tools/issues/875)]
 
 #### Sync
diff --git a/nf_core/modules/test_yml_builder.py b/nf_core/modules/test_yml_builder.py
index 63bbc289b0..8912784e38 100644
--- a/nf_core/modules/test_yml_builder.py
+++ b/nf_core/modules/test_yml_builder.py
@@ -275,8 +275,8 @@ def run_tests_workflow(self, command):
 
         tmp_dir = tempfile.mkdtemp()
         tmp_dir_repeat = tempfile.mkdtemp()
-        command += f" --outdir {tmp_dir}"
-        command_repeat = command + f" --outdir {tmp_dir_repeat}"
+        command_repeat = command + f" --outdir {tmp_dir_repeat} -work-dir {tmp_dir_repeat}"
+        command += f" --outdir {tmp_dir} -work-dir {tmp_dir}"
 
         log.info(f"Running '{self.module_name}' test with command:\n[violet]{command}")
         try: