diff --git a/py-json/cv_test_manager.py b/py-json/cv_test_manager.py
index cb764e35..0354839e 100644
--- a/py-json/cv_test_manager.py
+++ b/py-json/cv_test_manager.py
@@ -5,11 +5,9 @@ Note: This script is working as library for chamberview tests.
 
 import time
 
-from LANforge.lfcli_base import LFCliBase
 from realm import Realm
 import json
 from pprint import pprint
-import argparse
 from cv_test_reports import lanforge_reports as lf_rpt
 from csv_to_influx import *
 import os.path
@@ -68,12 +66,14 @@ class cv_test(Realm):
     def __init__(self,
                  lfclient_host="localhost",
                  lfclient_port=8080,
-                 lf_report_dir=""
+                 lf_report_dir="",
+                 debug=False
                  ):
         super().__init__(lfclient_host=lfclient_host,
                          lfclient_port=lfclient_port)
         self.lf_report_dir = lf_report_dir
         self.report_name = None
+        self.debug = debug
 
     # Add a config line to a text blob.  Will create new text blob
     # if none exists already.
@@ -128,7 +128,7 @@ class cv_test(Realm):
             "cmd": command
         }
         debug_par = ""
-        rsp = self.json_post("/gui-json/cmd%s" % debug_par, data, debug_=False, response_json_list_=response_json)
+        rsp = self.json_post("/gui-json/cmd%s" % debug_par, data, debug_=self.debug, response_json_list_=response_json)
         try:
             if response_json[0]["LAST"]["warnings"].startswith("Unknown"):
                 print("Unknown command?\n");
diff --git a/py-scripts/lf_dataplane_test.py b/py-scripts/lf_dataplane_test.py
index e76d6bc0..ff4ca0a7 100755
--- a/py-scripts/lf_dataplane_test.py
+++ b/py-scripts/lf_dataplane_test.py
@@ -139,7 +139,8 @@ class DataplaneTest(cv_test):
                  sets=[],
                  graph_groups=None,
                  report_dir="",
-                 test_rig=""
+                 test_rig="",
+                 debug=False
                  ):
         super().__init__(lfclient_host=lf_host, lfclient_port=lf_port)
 
@@ -168,6 +169,7 @@ class DataplaneTest(cv_test):
         self.ssh_port = ssh_port
         self.local_lf_report_dir = local_lf_report_dir
         self.test_rig = test_rig
+        self.debug = debug
 
     def setup(self):
         # Nothing to do at this time.
@@ -214,7 +216,7 @@ class DataplaneTest(cv_test):
                                  self.config_name, self.sets,
                                  self.pull_report, self.lf_host, self.lf_user, self.lf_password,
                                  cv_cmds, ssh_port=self.ssh_port, local_lf_report_dir=self.local_lf_report_dir,
-                                 graph_groups_file=self.graph_groups)
+                                 graph_groups_file=self.graph_groups, debug=self.debug)
         self.rm_text_blob(self.config_name, blob_test)  # To delete old config with same name
 
 
@@ -306,6 +308,7 @@ def main():
     parser.add_argument("--graph_groups", help="File to save graph_groups to", default=None)
     parser.add_argument("--report_dir", default="")
     parser.add_argument("--local_lf_report_dir", help="--local_lf_report_dir <where to pull reports to>  default '' put where dataplane script run from",default="")
+    parser.add_argument("--debug", default=False)
 
 
     args = parser.parse_args()
@@ -394,7 +397,8 @@ def main():
                             raw_lines_file = args.raw_lines_file,
                             sets = args.set,
                             graph_groups = args.graph_groups,
-                            test_rig=args.test_rig
+                            test_rig=args.test_rig,
+                            debug=args.debug
                             )
     CV_Test.setup()
     CV_Test.run()
diff --git a/py-scripts/lf_wifi_capacity_test.py b/py-scripts/lf_wifi_capacity_test.py
index 3e207317..951713ee 100755
--- a/py-scripts/lf_wifi_capacity_test.py
+++ b/py-scripts/lf_wifi_capacity_test.py
@@ -357,7 +357,8 @@ class WiFiCapacityTest(cv_test):
                  report_dir="",
                  graph_groups=None,
                  test_rig="",
-                 local_lf_report_dir=""
+                 local_lf_report_dir="",
+                 debug=False,
                  ):
         super().__init__(lfclient_host=lfclient_host, lfclient_port=lf_port)
 
@@ -396,6 +397,7 @@ class WiFiCapacityTest(cv_test):
         self.graph_groups = graph_groups
         self.test_rig = test_rig
         self.local_lf_report_dir = local_lf_report_dir
+        self.debug = debug
 
     def setup(self):
         if self.create_stations and self.stations != "":
@@ -473,7 +475,8 @@ class WiFiCapacityTest(cv_test):
         self.create_and_run_test(self.load_old_cfg, self.test_name, self.instance_name,
                                  self.config_name, self.sets,
                                  self.pull_report, self.lfclient_host, self.lf_user, self.lf_password,
-                                 cv_cmds, graph_groups_file=self.graph_groups, local_lf_report_dir=self.local_lf_report_dir)
+                                 cv_cmds, graph_groups_file=self.graph_groups, local_lf_report_dir=self.local_lf_report_dir,
+                                 debug=self.debug)
 
         self.rm_text_blob(self.config_name, blob_test)  # To delete old config with same name
 
@@ -528,6 +531,7 @@ def main():
     parser.add_argument("--scenario", default="")
     parser.add_argument("--graph_groups", help="File to save graph groups to", default=None)
     parser.add_argument("--local_lf_report_dir", help="--local_lf_report_dir <where to pull reports to>  default '' put where dataplane script run from",default="")
+    parser.add_argument("--debug", default=False)
 
     args = parser.parse_args()
 
@@ -562,7 +566,8 @@ def main():
                                 sets=args.set,
                                 graph_groups=args.graph_groups,
                                 test_rig=args.test_rig,
-                                local_lf_report_dir=args.local_lf_report_dir
+                                local_lf_report_dir=args.local_lf_report_dir,
+                                debug=args.debug
                                 )
     WFC_Test.setup()
     WFC_Test.run()