diff --git a/.gitpod.yml b/.gitpod.yml
index 91c04d7f94..cadccac4ba 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -9,6 +9,12 @@ tasks:
   - name: unset JAVA_TOOL_OPTIONS
     command: |
       unset JAVA_TOOL_OPTIONS
+
+  - name: Use pdiff for nf-test diff viewing
+    command: |
+      export NFT_DIFF="pdiff"
+      export NFT_DIFF_ARGS="--line-numbers --expand-tabs=2"
+
 vscode:
   extensions: # based on nf-core.nf-core-extensionpack
     - codezombiech.gitignore # Language support for .gitignore files
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9121432a41..a4a033fa4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Template
 
 - Use `pre-commit` to lint files in GitHub CI ([#2635](https://github.com/nf-core/tools/pull/2635))
+- Use pdiff also on gitpod for nf-test ([#2640](https://github.com/nf-core/tools/pull/2640))
 
 ### Download
 
diff --git a/nf_core/pipeline-template/.gitpod.yml b/nf_core/pipeline-template/.gitpod.yml
index acf7269536..78d68ffcb0 100644
--- a/nf_core/pipeline-template/.gitpod.yml
+++ b/nf_core/pipeline-template/.gitpod.yml
@@ -7,6 +7,10 @@ tasks:
   - name: unset JAVA_TOOL_OPTIONS
     command: |
       unset JAVA_TOOL_OPTIONS
+  - name: Use pdiff for nf-test diff viewing
+    command: |
+      export NFT_DIFF="pdiff"
+      export NFT_DIFF_ARGS="--line-numbers --expand-tabs=2"
 vscode:
   extensions: # based on nf-core.nf-core-extensionpack
     - codezombiech.gitignore # Language support for .gitignore files