diff --git a/ansible/roles/test/tasks/acl/acl_traffic_test/run_ping_test.yml b/ansible/roles/test/tasks/acl/acl_traffic_test/run_ping_test.yml
index 33960998e7c..01ea8dba5ee 100644
--- a/ansible/roles/test/tasks/acl/acl_traffic_test/run_ping_test.yml
+++ b/ansible/roles/test/tasks/acl/acl_traffic_test/run_ping_test.yml
@@ -2,10 +2,13 @@
 # Execute ping and check the log.
 #-----------------------------------------
 
-- name: Get an unique timestamp to feed to testname_unique
+- name: Initialize some variables for loganalyzer
   set_fact:
-    unique_timestamp: "{{ lookup('pipe','date +%Y-%m-%d-%H:%M:%S') }}"
-- include_vars: "vars/run_ping_test_vars.yml"
+    testname_unique: "{{ testname }}.{{ lookup('pipe','date +%Y-%m-%d-%H:%M:%S') }}"
+- set_fact:
+    test_out_dir: "{{ out_dir }}/{{ testname_unique }}"
+    summary_file: "summary.loganalysis.{{ testname_unique }}.log"
+    result_file: "result.loganalysis.{{ testname_unique }}.log"
 
 - name: Start log analyser
   include: roles/test/files/tools/loganalyzer/loganalyzer_init.yml
diff --git a/ansible/roles/test/tasks/acl/acl_traffic_test/run_ptf_test.yml b/ansible/roles/test/tasks/acl/acl_traffic_test/run_ptf_test.yml
index 43afe816056..dc8436a49dd 100644
--- a/ansible/roles/test/tasks/acl/acl_traffic_test/run_ptf_test.yml
+++ b/ansible/roles/test/tasks/acl/acl_traffic_test/run_ptf_test.yml
@@ -2,10 +2,13 @@
 # Send some TCP packets.
 #-----------------------------------------
 
-- name: Get an unique timestamp to feed to testname_unique
+- name: Initialize some variables for loganalyzer
   set_fact:
-    unique_timestamp: "{{ lookup('pipe','date +%Y-%m-%d-%H:%M:%S') }}"
-- include_vars: "vars/run_ptf_test_vars.yml"
+    testname_unique: "{{ testname }}.{{ lookup('pipe','date +%Y-%m-%d-%H:%M:%S') }}"
+- set_fact:
+    test_out_dir: "{{ out_dir }}/{{ testname_unique }}"
+    summary_file: "summary.loganalysis.{{ testname_unique }}.log"
+    result_file: "result.loganalysis.{{ testname_unique }}.log"
 
 - block:
     - name: Execute ping from host to switch to validate link
diff --git a/ansible/roles/test/tasks/run_command_with_log_analyzer.yml b/ansible/roles/test/tasks/run_command_with_log_analyzer.yml
index 23d884b8dd4..a9e5bd169f9 100644
--- a/ansible/roles/test/tasks/run_command_with_log_analyzer.yml
+++ b/ansible/roles/test/tasks/run_command_with_log_analyzer.yml
@@ -5,10 +5,17 @@
 #   3) Run cleanup if needed.
 #-----------------------------------------
 
-- name: Get an unique timestamp to feed to testname_unique
+- name: Initialize some variables for loganalyzer
   set_fact:
-    unique_timestamp: "{{lookup('pipe','date +%Y-%m-%d-%H:%M:%S')}}"
-- include_vars: "vars/run_config_test_vars.yml"
+    testname_unique: "{{ testname }}.{{ lookup('pipe','date +%Y-%m-%d-%H:%M:%S') }}"
+- set_fact:
+    test_out_dir: "{{ out_dir }}/{{ testname_unique }}"
+    loganalyzer_init: roles/test/files/tools/loganalyzer/loganalyzer_init.yml
+    loganalyzer_analyze: roles/test/files/tools/loganalyzer/loganalyzer_analyze.yml
+    match_file: loganalyzer_common_match.txt
+    ignore_file: loganalyzer_common_ignore.txt
+    summary_file: summary.loganalysis.{{ testname_unique }}.log
+    result_file: result.loganalysis.{{ testname_unique }}.log
 
 - block:
     - name: Initialize loganalizer. Put start marker to log file.
diff --git a/ansible/roles/test/tasks/run_loganalyzer.yml b/ansible/roles/test/tasks/run_loganalyzer.yml
index d0b8509004a..125c058b9a7 100644
--- a/ansible/roles/test/tasks/run_loganalyzer.yml
+++ b/ansible/roles/test/tasks/run_loganalyzer.yml
@@ -3,10 +3,17 @@
 # or analyze-phase of loganalyzer.
 #-----------------------------------------
 
-- name: Get an unique timestamp to feed to testname_unique
+- name: Initialize some variables for loganalyzer
   set_fact:
-    unique_timestamp: "{{lookup('pipe','date +%Y-%m-%d-%H:%M:%S')}}"
-- include_vars: "vars/run_loganalyzer_vars.yml"
+    testname_unique: "{{ testname }}.{{ lookup('pipe','date +%Y-%m-%d-%H:%M:%S') }}"
+- set_fact:
+    test_out_dir: "{{ out_dir }}/{{ testname_unique }}"
+    loganalyzer_init: roles/test/files/tools/loganalyzer/loganalyzer_init.yml
+    loganalyzer_analyze: roles/test/files/tools/loganalyzer/loganalyzer_analyze.yml
+    match_file: loganalyzer_common_match.txt
+    ignore_file: loganalyzer_common_ignore.txt
+    summary_file: summary.loganalysis.{{ testname_unique }}.log
+    result_file: result.loganalysis.{{ testname_unique }}.log
 
 - name: Initialize loganalizer. Put start marker to log file.
   include: "{{ loganalyzer_init }}"
diff --git a/ansible/vars/run_config_test_vars.yml b/ansible/vars/run_config_test_vars.yml
deleted file mode 100644
index 686892092d4..00000000000
--- a/ansible/vars/run_config_test_vars.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-
-testname_unique: "{{ testname }}.{{ unique_timestamp }}"
-
-test_out_dir: "{{ out_dir }}/{{ testname_unique }}"
-loganalyzer_init: roles/test/files/tools/loganalyzer/loganalyzer_init.yml
-loganalyzer_analyze: roles/test/files/tools/loganalyzer/loganalyzer_analyze.yml
-
-match_file: loganalyzer_common_match.txt
-ignore_file: loganalyzer_common_ignore.txt
-
-summary_file: summary.loganalysis.{{ testname_unique }}.log
-result_file: result.loganalysis.{{ testname_unique }}.log
diff --git a/ansible/vars/run_loganalyzer_vars.yml b/ansible/vars/run_loganalyzer_vars.yml
deleted file mode 100644
index e3df78a571e..00000000000
--- a/ansible/vars/run_loganalyzer_vars.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-
-testname_unique: "{{ testname }}.{{ unique_timestamp }}"
-
-test_out_dir: "{{ out_dir }}/{{ testname_unique }}"
-loganalyzer_init: roles/test/files/tools/loganalyzer/loganalyzer_init.yml
-loganalyzer_analyze: roles/test/files/tools/loganalyzer/loganalyzer_analyze.yml
-
-match_file: loganalyzer_common_match.txt
-ignore_file: loganalyzer_common_ignore.txt
-
-summary_file: summary.loganalysis.{{ testname_unique }}.log
-result_file: result.loganalysis.{{ testname_unique }}.log
-
-run_analyze_and_check: "roles/test/tasks/run_analyze_and_check.yml"
diff --git a/ansible/vars/run_ping_test_vars.yml b/ansible/vars/run_ping_test_vars.yml
deleted file mode 100644
index a4dd27773c4..00000000000
--- a/ansible/vars/run_ping_test_vars.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-
-testname_unique: "{{ testname }}.{{ unique_timestamp }}"
-
-test_out_dir: "{{ out_dir }}/{{ testname_unique }}"
-summary_file: "summary.loganalysis.{{ testname_unique }}.log"
-result_file: "result.loganalysis.{{ testname_unique }}.log"
diff --git a/ansible/vars/run_ptf_test_vars.yml b/ansible/vars/run_ptf_test_vars.yml
deleted file mode 100644
index a4dd27773c4..00000000000
--- a/ansible/vars/run_ptf_test_vars.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-
-testname_unique: "{{ testname }}.{{ unique_timestamp }}"
-
-test_out_dir: "{{ out_dir }}/{{ testname_unique }}"
-summary_file: "summary.loganalysis.{{ testname_unique }}.log"
-result_file: "result.loganalysis.{{ testname_unique }}.log"