diff --git a/src/workflow/unit/ArcanistUnitWorkflow.php b/src/workflow/unit/ArcanistUnitWorkflow.php
index 46d632ed..71488138 100644
--- a/src/workflow/unit/ArcanistUnitWorkflow.php
+++ b/src/workflow/unit/ArcanistUnitWorkflow.php
@@ -71,13 +71,21 @@ EOTEXT
 
     if ($this->getArgument('paths')) {
       // TODO: deal with git stuff
-
       $paths = $this->getArgument('paths');
     } else {
       $paths = $repository_api->getWorkingCopyStatus();
+
+      // TODO: clean this up
+      foreach ($paths as $path => $mask) {
+        if ($mask & ArcanistRepositoryAPI::FLAG_UNTRACKED) {
+          unset($paths[$path]);
+        }
+      }
+
       $paths = array_keys($paths);
     }
 
+
     PhutilSymbolLoader::loadClass($engine_class);
     $engine = newv($engine_class, array());
     $engine->setWorkingCopy($working_copy);