diff --git a/tests/includes/pre_Debian.yml b/tests/includes/pre_Debian.yml
index 29f758a..e15fb45 100644
--- a/tests/includes/pre_Debian.yml
+++ b/tests/includes/pre_Debian.yml
@@ -38,10 +38,10 @@
   when: nginx_php70
 
 - name: SERVICE | Force start services
-  service: name={{ item.name }} state=started
+  service: name="{{ item.name }}" state=started
   register: sf
   with_items:
     - { name: 'php5-fpm', cond: "{{ nginx_php56 }}" }
     - { name: 'php7.0-fpm', cond: "{{ nginx_php70 }}" }
     - { name: 'fcgiwrap', cond: true }
-  when: "{{ item.cond }}"
+  when: item.cond
diff --git a/tests/test.yml b/tests/test.yml
index 0da990e..59bd274 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -386,7 +386,7 @@
       command: "curl -v -H 'Host: {{ item.name }}' http://127.0.0.1/"
       changed_when: false
       register: sslredirok
-      failed_when: "'< Location: https://{{ item.name }}{{ ':' + item.port if item.port is defined else '' }}/' not in sslredirok.stderr"
+      failed_when: '"< Location:" + " https://%s%s" % (item.name, ":" + item.port if item.port is defined else "") not in sslredirok.stderr'
       with_items:
         - name: 'test-ssl-redirect.local'
         - name: 'test-ssl-redirect-many.local'