diff --git a/tests/__init__.py b/tests/__init__.py
index 92f429b2..1b1c9025 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -20,9 +20,7 @@ import imp
 import logging
 import os
 
-os.environ["VIRTINST_TEST_TRACKPROPS"] = "1"
 os.environ["VIRTINST_TEST_SUITE"] = "1"
-os.environ["VIRTINST_TEST_CLI_VIRTXML"] = "1"
 
 import virtinst
 virtinst.stable_defaults = False
diff --git a/tests/utils.py b/tests/utils.py
index 0a65d8ce..c0e95872 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -45,8 +45,6 @@ urixenia64 = testuri + _capsprefix + "xen-ia64-hvm.xml,xen"
 urikvm = uriqemu + _capsprefix + "libvirt-1.1.2-qemu-caps.xml"
 urilxc = testuri + _capsprefix + "capabilities-lxc.xml,lxc"
 
-os.environ["VIRTINST_TEST_SCRATCHDIR"] = os.getcwd()
-
 
 def get_debug():
     return ("DEBUG_TESTS" in os.environ and
diff --git a/virt-xml b/virt-xml
index df750778..2435bbbe 100755
--- a/virt-xml
+++ b/virt-xml
@@ -241,12 +241,9 @@ def setup_device(dev):
 
     logging.debug("Doing setup for disk=%s", dev)
 
-    if "VIRTINST_TEST_CLI_VIRTXML" in os.environ:
-        meter = progress.BaseMeter()
-    else:
-        meter = (cli.quiet and
-                 progress.BaseMeter() or
-                 progress.TextMeter(fo=sys.stdout))
+    meter = ((cli.quiet or "VIRTINST_TEST_SUITE" in os.environ) and
+             progress.BaseMeter() or
+             progress.TextMeter(fo=sys.stdout))
 
     dev.setup(meter)
     dev.virt_xml_setup = True
diff --git a/virtinst/util.py b/virtinst/util.py
index 71296e59..31ccd385 100644
--- a/virtinst/util.py
+++ b/virtinst/util.py
@@ -453,9 +453,8 @@ def uuidstr(rawuuid):
 
 
 def get_system_scratchdir(hvtype):
-    scratchdir = os.environ.get("VIRTINST_TEST_SCRATCHDIR", None)
-    if scratchdir:
-        return scratchdir
+    if "VIRTINST_TEST_SUITE" in os.environ:
+        return os.getcwd()
 
     if hvtype == "test":
         return "/tmp"
diff --git a/virtinst/xmlbuilder.py b/virtinst/xmlbuilder.py
index 068dd35b..d46738c6 100644
--- a/virtinst/xmlbuilder.py
+++ b/virtinst/xmlbuilder.py
@@ -32,7 +32,7 @@ from virtinst import util
 # This whole file is calling around into non-public functions that we
 # don't want regular API users to touch
 
-_trackprops = bool("VIRTINST_TEST_TRACKPROPS" in os.environ)
+_trackprops = bool("VIRTINST_TEST_SUITE" in os.environ)
 _allprops = []
 _seenprops = []