diff --git a/.gitignore b/.gitignore
index 8c81b746955d..fe3584e852ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,7 @@ app_creds_real.py
 *.user
 *.sln.docstates
 .vs/
-.vscode
+.vscode/
 
 # Windows image file caches
 Thumbs.db
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 6459aad91139..000000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "git.ignoreLimitWarning": true,
-    "python.testing.pytestArgs": [],
-    "python.testing.pytestEnabled": true
-}
\ No newline at end of file
diff --git a/scripts/devops_tasks/setup_execute_tests.py b/scripts/devops_tasks/setup_execute_tests.py
index dc5aa9dd2056..5ddede915d27 100644
--- a/scripts/devops_tasks/setup_execute_tests.py
+++ b/scripts/devops_tasks/setup_execute_tests.py
@@ -94,6 +94,8 @@ def prep_and_run_tests(targeted_packages, python_version, test_res):
 
     if args.disablecov:
         test_results_arg.append('--no-cov')
+    else:
+        test_results_arg.extend(['--durations=10', '--cov', '--cov-report='])
 
     if args.mark_arg:
         test_results_arg.extend(['-m', '"{}"'.format(args.mark_arg)])
diff --git a/setup.cfg b/setup.cfg
index d6964917ce89..ad481747f45b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,2 @@
 [tool:pytest]
-addopts = --durations=10 --cov --cov-report=
 norecursedirs = models
\ No newline at end of file