diff --git a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml
index 0844d4c..edb149d 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml
@@ -147,7 +147,7 @@
   cmd: |
     FLUENTD_SERVICE=`salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@fluentd:agent' test.ping 1>/dev/null 2>&1 && echo true`;
     echo "Fluentd service presence: ${FLUENTD_SERVICE}";
-    if [[ "$INFLUXDB_SERVICE" == "true" ]]; then
+    if [[ "$FLUENTD_SERVICE" == "true" ]]; then
         salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@fluentd:agent' state.sls fluentd
     else
         salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@heka:log_collector' state.sls heka.log_collector
@@ -161,7 +161,7 @@
   cmd: |
     CEILO=`salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@heka:ceilometer_collector:enabled' test.ping 1>/dev/null 2>&1 && echo true`;
     echo "Ceilometer service presence: ${CEILO}";
-    if [[ "$INFLUXDB_SERVICE" == "true" ]]; then
+    if [[ "$CEILO" == "true" ]]; then
         salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@heka:ceilometer_collector:enabled' state.sls heka.ceilometer_collector;
         salt --hard-crash --state-output=mixed --state-verbose=False -C '@heka:ceilometer_collector:enabled' service.restart ceilometer_collector
     fi
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/sl.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/sl.yaml
index 57fe79d..ac1302d 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/sl.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/sl.yaml
@@ -146,7 +146,7 @@
   cmd: |
     FLUENTD_SERVICE=`salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@fluentd:agent' test.ping 1>/dev/null 2>&1 && echo true`;
     echo "Fluentd service presence: ${FLUENTD_SERVICE}";
-    if [[ "$INFLUXDB_SERVICE" == "true" ]]; then
+    if [[ "$FLUENTD_SERVICE" == "true" ]]; then
         salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@fluentd:agent' state.sls fluentd
     else
         salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@heka:log_collector' state.sls heka.log_collector
@@ -160,7 +160,7 @@
   cmd: |
     CEILO=`salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@heka:ceilometer_collector:enabled' test.ping 1>/dev/null 2>&1 && echo true`;
     echo "Ceilometer service presence: ${CEILO}";
-    if [[ "$INFLUXDB_SERVICE" == "true" ]]; then
+    if [[ "$CEILO" == "true" ]]; then
         salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@heka:ceilometer_collector:enabled' state.sls heka.ceilometer_collector;
         salt --hard-crash --state-output=mixed --state-verbose=False -C '@heka:ceilometer_collector:enabled' service.restart ceilometer_collector
     fi
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr/sl.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr/sl.yaml
index ff37f3e..527d49c 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr/sl.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr/sl.yaml
@@ -146,7 +146,7 @@
   cmd: |
     FLUENTD_SERVICE=`salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@fluentd:agent' test.ping 1>/dev/null 2>&1 && echo true`;
     echo "Fluentd service presence: ${FLUENTD_SERVICE}";
-    if [[ "$INFLUXDB_SERVICE" == "true" ]]; then
+    if [[ "$FLUENTD_SERVICE" == "true" ]]; then
         salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@fluentd:agent' state.sls fluentd
     else
         salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@heka:log_collector' state.sls heka.log_collector
@@ -160,7 +160,7 @@
   cmd: |
     CEILO=`salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@heka:ceilometer_collector:enabled' test.ping 1>/dev/null 2>&1 && echo true`;
     echo "Ceilometer service presence: ${CEILO}";
-    if [[ "$INFLUXDB_SERVICE" == "true" ]]; then
+    if [[ "$CEILO" == "true" ]]; then
         salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@heka:ceilometer_collector:enabled' state.sls heka.ceilometer_collector;
         salt --hard-crash --state-output=mixed --state-verbose=False -C '@heka:ceilometer_collector:enabled' service.restart ceilometer_collector
     fi
diff --git a/tcp_tests/templates/cookied-mcp-pike-ovs/sl.yaml b/tcp_tests/templates/cookied-mcp-pike-ovs/sl.yaml
index 4c554d5..494ac09 100644
--- a/tcp_tests/templates/cookied-mcp-pike-ovs/sl.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-ovs/sl.yaml
@@ -148,7 +148,7 @@
   cmd: |
     FLUENTD_SERVICE=`salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@fluentd:agent' test.ping 1>/dev/null 2>&1 && echo true`;
     echo "Fluentd service presence: ${FLUENTD_SERVICE}";
-    if [[ "$INFLUXDB_SERVICE" == "true" ]]; then
+    if [[ "$FLUENTD_SERVICE" == "true" ]]; then
         salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@fluentd:agent' state.sls fluentd
     else
         salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@heka:log_collector' state.sls heka.log_collector
@@ -162,7 +162,7 @@
   cmd: |
     CEILO=`salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@heka:ceilometer_collector:enabled' test.ping 1>/dev/null 2>&1 && echo true`;
     echo "Ceilometer service presence: ${CEILO}";
-    if [[ "$INFLUXDB_SERVICE" == "true" ]]; then
+    if [[ "$CEILO" == "true" ]]; then
         salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@heka:ceilometer_collector:enabled' state.sls heka.ceilometer_collector;
         salt --hard-crash --state-output=mixed --state-verbose=False -C '@heka:ceilometer_collector:enabled' service.restart ceilometer_collector
     fi