diff --git a/indra/llxml/tests/llcontrol_test.cpp b/indra/llxml/tests/llcontrol_test.cpp
index cf1f24ac5ffff64f315124b69e01e61a4b63bf5c..1ab564264df00558db4751f57ff0a8400ff32ed3 100644
--- a/indra/llxml/tests/llcontrol_test.cpp
+++ b/indra/llxml/tests/llcontrol_test.cpp
@@ -54,7 +54,21 @@ namespace tut
 			random.generate();
 			// generate temp dir
 			std::ostringstream oStr;
+
+#ifdef LL_WINDOWS
+			char* tmp_dir = getenv("TMP");
+			if(tmp_dir)
+			{
+				oStr << tmp_dir << "/llcontrol-test-" << random << "/";
+			}
+			else
+			{
+				oStr << "c:/tmp/llcontrol-test-" << random << "/";
+			}
+#else
 			oStr << "/tmp/llcontrol-test-" << random << "/";
+#endif
+
 			mTestConfigDir = oStr.str();
 			mTestConfigFile = mTestConfigDir + "settings.xml";
 			LLFile::mkdir(mTestConfigDir);