diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 7d4262cba6722ea7117529bb708e4b33e9706914..1563164fd3ed30c4e4f4cc93ddc7109882ecd66d 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -655,14 +655,14 @@ def main():
   parser.add_option("--yes-do-it", dest="yes_do_it",
                     action="store_true",
                     help="Really execute the tests")
-  (qa_config.options, args) = parser.parse_args()
+  (opts, args) = parser.parse_args()
 
   if len(args) == 1:
     (config_file, ) = args
   else:
     parser.error("Wrong number of arguments.")
 
-  if not qa_config.options.yes_do_it:
+  if not opts.yes_do_it:
     print ("Executing this script irreversibly destroys any Ganeti\n"
            "configuration on all nodes involved. If you really want\n"
            "to start testing, supply the --yes-do-it option.")
diff --git a/qa/qa_config.py b/qa/qa_config.py
index 6c4e3f53f568497037331cdfcf042405aa81285f..cf697509f50f9ade2850c95e6a898d5f57783f9f 100644
--- a/qa/qa_config.py
+++ b/qa/qa_config.py
@@ -40,7 +40,6 @@ _EXCLUSIVE_STORAGE_KEY = "_exclusive_storage"
 
 
 cfg = {}
-options = None
 
 
 def Load(path):