diff --git a/py/vttest/environment.py b/py/vttest/environment.py
index <HASH>..<HASH> 100644
--- a/py/vttest/environment.py
+++ b/py/vttest/environment.py
@@ -28,12 +28,7 @@ mysql_db_class = None
 
 def get_test_directory():
   """Returns the toplevel directory for the tests. Might create it."""
-  dataroot = os.environ['VTDATAROOT']
-  if dataroot:
-    directory = os.path.join(dataroot, "test")
-    os.mkdir(directory)
-  else:
-    directory = tempfile.mkdtemp(prefix='vt')
+  directory = tempfile.mkdtemp(prefix='vttest', dir=os.environ.get('VTDATAROOT', None))
   # Override VTDATAROOT to point to the newly created dir
   os.environ['VTDATAROOT'] = directory
   os.mkdir(get_logs_directory(directory))
diff --git a/py/vttest/mysql_flavor.py b/py/vttest/mysql_flavor.py
index <HASH>..<HASH> 100644
--- a/py/vttest/mysql_flavor.py
+++ b/py/vttest/mysql_flavor.py
@@ -1,4 +1,7 @@
-"""Define abstractions for various mysql flavors."""
+"""Define abstractions for various mysql flavors.
+
+This moduleis used by mysql_db_mysqlctl.py to handle differences
+between various flavors of mysql"""
 
 import environment
 import logging
vttest: address review comments