diff --git a/handlers/main.yml b/handlers/main.yml
index 883ffe3..55ec517 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -6,8 +6,12 @@
   notify: real-reload nginx
 
 - name: real-reload nginx
-  service: name=nginx state=reloaded
+  service:
+    name: nginx
+    state: reloaded
 
 - name: restart nginx freebsd
-  service: name=nginx state=restarted
+  service:
+    name: nginx
+    state: restarted
   when: ansible_distribution == "FreeBSD"
diff --git a/tests/includes/post_Debian.yml b/tests/includes/post_Debian.yml
index 79d7353..6d4bf93 100644
--- a/tests/includes/post_Debian.yml
+++ b/tests/includes/post_Debian.yml
@@ -16,4 +16,6 @@
   when: ansible_distribution_major_version | version_compare('9', 'lt')
 
 - name: SERVICE | Ensure backuppc is started
-  service: name=backuppc state=started
+  service:
+    name: backuppc
+    state: started
diff --git a/tests/test.yml b/tests/test.yml
index e7a3eb2..990b3a5 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -5,11 +5,17 @@
     - name: INCLUDE | Pre_tasks related to OS version
       include: "includes/pre_{{ ansible_distribution }}.yml"
     - name: FILE | Create an internal SSL dir
-      file: path={{ int_ansible_ssl_dir }} state=directory
+      file:
+        path: "{{ int_ansible_ssl_dir }}"
+        state: directory
     - name: COPY | Deploy test certificate
-      copy: src=file/test.crt dest={{ int_ansible_ssl_dir }}/test.crt
+      copy:
+        src: "file/test.crt"
+        dest: "{{ int_ansible_ssl_dir }}/test.crt"
     - name: COPY | Deploy test key
-      copy: src=file/test.key dest={{ int_ansible_ssl_dir }}/test.key
+      copy:
+        src: "file/test.key"
+        dest: "{{ int_ansible_ssl_dir }}/test.key"
 
   vars:
 # Internal vars
@@ -239,13 +245,17 @@
 # Deploy index files
 # --------------------------------
     - name: -- Add PHP file --
-      copy: dest="{{ nginx_root }}/{{ item }}/public/index.php" content="<?php phpinfo();"
+      copy:
+        dest: "{{ nginx_root }}/{{ item }}/public/index.php"
+        content: "<?php phpinfo();"
       with_items:
         - 'test-php.local'
         - 'test-php-index.local'
 
     - name: -- Add HTML file --
-      copy: dest="{{ item }}/index.html" content="Index HTML test OK\n"
+      copy:
+        dest: "{{ item }}/index.html"
+        content: "Index HTML test OK\n"
       with_items:
         - '{{ nginx_root }}/first-test/public'
         - '/var/tmp'
@@ -255,10 +265,14 @@
         - '{{ nginx_root }}/test-ssl-proxy-protocol.local/public'
 
     - name: -- Create directory --
-      file: path={{ nginx_root }}/test-htpasswd.local/public/hello state=directory
+      file:
+        path: "{{ nginx_root }}/test-htpasswd.local/public/hello"
+        state: directory
 
     - name: -- Add HTML file hello --
-      copy: dest="{{ nginx_root }}/test-htpasswd.local/public/hello/index.html" content="hello\n"
+      copy:
+        dest: "{{ nginx_root }}/test-htpasswd.local/public/hello/index.html"
+        content: "hello\n"
 
 # --------------------------------
 # Test custom facts