diff --git a/tasks/behat.yml b/tasks/behat.yml
index 0831bdb..4eacf2e 100644
--- a/tasks/behat.yml
+++ b/tasks/behat.yml
@@ -10,18 +10,8 @@
 
 - name: Run behat tests.
   block:
-    - name: Copy behat env file.
-      copy:
-        src: "{{ app_directory }}/.env.behat"
-        dest: "{{ app_directory }}/.env"
-
     - name: Run Behat pipeline tests.
       shell: 'vendor/bin/behat features/pipeline'
       args:
         chdir: "{{ app_directory }}"
-
-    - name: Remove behat env.
-      file:
-        path: "{{ app_directory }}/.env"
-        state: absent
   when: run_behat.stat.exists and behat_features.stat.exists
diff --git a/tasks/main.yml b/tasks/main.yml
index ea8a28d..0fa5aa0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -55,6 +55,7 @@
       when: run_composer.stat.exists
 
     - include: testing.yml
+    - include: env.yml
 
     - name: Check if npm package.json exists
       stat:
@@ -81,8 +82,6 @@
         working_dir: "{{ app_directory }}"
       when: run_composer.stat.exists
 
-    - include: env.yml
-
     - name: Craft Security Key Generate.
       shell: 'php craft setup/security-key'
       args: