diff --git a/src/unit/parser/ArcanistGoTestResultParser.php b/src/unit/parser/ArcanistGoTestResultParser.php
index ce6451f5..92a9c9ae 100644
--- a/src/unit/parser/ArcanistGoTestResultParser.php
+++ b/src/unit/parser/ArcanistGoTestResultParser.php
@@ -1,132 +1,135 @@
 <?php
 
 /**
  * Go Test Result Parsing utility
  *
  * (To generate test output, run something like: `go test -v`)
  */
 final class ArcanistGoTestResultParser extends ArcanistTestResultParser {
 
   /**
    * Parse test results from Go test report
    * (e.g. `go test -v`)
    *
    * @param string $path Path to test
    * @param string $test_results String containing Go test output
    *
    * @return array
    */
   public function parseTestResults($path, $test_results) {
     $test_results = explode("\n", $test_results);
 
     $results = array();
     // We'll get our full test case name at the end and add it back in
     $test_case_name = '';
 
     // Temp store for test case results (in case we run multiple test cases)
     $test_case_results = array();
     foreach ($test_results as $i => $line) {
 
       if (strncmp($line, '--- PASS', 8) === 0) {
         // We have a passing test
         $meta = array();
         preg_match(
           '/^--- PASS: (?P<test_name>.+) \((?P<time>.+)\s*s(?:econds?)?\).*/',
           $line,
           $meta);
 
         $result = new ArcanistUnitTestResult();
         // For now set name without test case, we'll add it later
         $result->setName($meta['test_name']);
         $result->setResult(ArcanistUnitTestResult::RESULT_PASS);
         $result->setDuration((float)$meta['time']);
         $test_case_results[] = $result;
 
         continue;
       }
 
       if (strncmp($line, '--- FAIL', 8) === 0) {
         // We have a failing test
         $reason = trim($test_results[$i + 1]);
         $meta = array();
         preg_match(
           '/^--- FAIL: (?P<test_name>.+) \((?P<time>.+)\s*s(?:econds?)?\).*/',
           $line,
           $meta);
 
         $result = new ArcanistUnitTestResult();
         $result->setName($meta['test_name']);
         $result->setResult(ArcanistUnitTestResult::RESULT_FAIL);
         $result->setDuration((float)$meta['time']);
         $result->setUserData($reason."\n");
 
         $test_case_results[] = $result;
 
         continue;
       }
 
       if (strncmp($line, 'ok', 2) === 0) {
         $meta = array();
         preg_match(
-          '/^ok[\s\t]+(?P<test_name>\w.*)[\s\t]+(?P<time>.*)s.*/',
+          '/^ok[\s]+(?P<test_name>\w.*)[\s]+(?:(?P<time>.*)s|\(cached\))/',
           $line,
           $meta);
 
         $test_case_name = str_replace('/', '::', $meta['test_name']);
 
         // Our test case passed
         // check to make sure we were in verbose (-v) mode
         if (empty($test_case_results)) {
           // We weren't in verbose mode
           // create one successful result for the whole test case
           $test_name = 'Go::TestCase::'.$test_case_name;
 
           $result = new ArcanistUnitTestResult();
           $result->setName($test_name);
           $result->setResult(ArcanistUnitTestResult::RESULT_PASS);
-          $result->setDuration((float)$meta['time']);
+
+          if (array_key_exists('time', $meta)) {
+            $result->setDuration((float)$meta['time']);
+          }
 
           $results[] = $result;
         } else {
           $test_case_results = $this->fixNames(
             $test_case_results,
             $test_case_name);
           $results = array_merge($results, $test_case_results);
           $test_case_results = array();
         }
 
         continue;
       }
 
       if (strncmp($line, "FAIL\t", 5) === 0) {
         $meta = array();
         preg_match(
           '/^FAIL[\s\t]+(?P<test_name>\w.*)[\s\t]+.*/',
           $line,
           $meta);
 
         $test_case_name = str_replace('/', '::', $meta['test_name']);
 
         $test_case_results = $this->fixNames(
           $test_case_results,
           $test_case_name);
         $results = array_merge($results, $test_case_results);
         $test_case_results = array();
 
         continue;
       }
     }
 
     return $results;
   }
 
   private function fixNames($test_case_results, $test_case_name) {
     foreach ($test_case_results as &$result) {
       $test_name = $result->getName();
       $result->setName('Go::Test::'.$test_case_name.'::'.$test_name);
     }
 
     return $test_case_results;
   }
 
 }
diff --git a/src/unit/parser/__tests__/ArcanistGoTestResultParserTestCase.php b/src/unit/parser/__tests__/ArcanistGoTestResultParserTestCase.php
index cf6cf5ed..923787ee 100644
--- a/src/unit/parser/__tests__/ArcanistGoTestResultParserTestCase.php
+++ b/src/unit/parser/__tests__/ArcanistGoTestResultParserTestCase.php
@@ -1,204 +1,225 @@
 <?php
 
 /**
  * Test for @{class:ArcanistGoTestResultParser}.
  */
 final class ArcanistGoTestResultParserTestCase extends PhutilTestCase {
 
   public function testSingleTestCaseSuccessful() {
     $stubbed_results = Filesystem::readFile(
       dirname(__FILE__).'/testresults/go.single-test-case-successful');
 
     $parsed_results = id(new ArcanistGoTestResultParser())
       ->parseTestResults('subpackage_test.go', $stubbed_results);
 
     $this->assertEqual(2, count($parsed_results));
     $this->assertEqual(
       'Go::Test::package::subpackage::TestFoo',
       $parsed_results[0]->getName());
     foreach ($parsed_results as $result) {
       $this->assertEqual(
         ArcanistUnitTestResult::RESULT_PASS,
         $result->getResult());
     }
   }
 
   public function testSingleTestCaseFailure() {
     $stubbed_results = Filesystem::readFile(
       dirname(__FILE__).'/testresults/go.single-test-case-failure');
 
     $parsed_results = id(new ArcanistGoTestResultParser())
       ->parseTestResults('subpackage_test.go', $stubbed_results);
 
     $this->assertEqual(2, count($parsed_results));
     $this->assertEqual(
       ArcanistUnitTestResult::RESULT_FAIL,
       $parsed_results[0]->getResult());
     $this->assertEqual(
       ArcanistUnitTestResult::RESULT_PASS,
       $parsed_results[1]->getResult());
   }
 
   public function testMultipleTestCasesSuccessful() {
     $stubbed_results = Filesystem::readFile(
       dirname(__FILE__).'/testresults/go.multiple-test-cases-successful');
 
     $parsed_results = id(new ArcanistGoTestResultParser())
       ->parseTestResults('package', $stubbed_results);
 
     $this->assertEqual(3, count($parsed_results));
     $this->assertEqual(
       'Go::Test::package::subpackage1::TestFoo1',
       $parsed_results[0]->getName());
     $this->assertEqual(
       'Go::Test::package::subpackage2::TestFoo2',
       $parsed_results[2]->getName());
     foreach ($parsed_results as $result) {
       $this->assertEqual(
         ArcanistUnitTestResult::RESULT_PASS,
         $result->getResult());
     }
   }
 
   public function testMultipleTestCasesFailure() {
     $stubbed_results = Filesystem::readFile(
       dirname(__FILE__).'/testresults/go.multiple-test-cases-failure');
 
     $parsed_results = id(new ArcanistGoTestResultParser())
       ->parseTestResults('package', $stubbed_results);
 
     $this->assertEqual(3, count($parsed_results));
     $this->assertEqual(
       'Go::Test::package::subpackage1::TestFoo1',
       $parsed_results[0]->getName());
     $this->assertEqual(
       'Go::Test::package::subpackage2::TestFoo2',
       $parsed_results[2]->getName());
     $this->assertEqual(
       ArcanistUnitTestResult::RESULT_PASS,
       $parsed_results[0]->getResult());
     $this->assertEqual(
       ArcanistUnitTestResult::RESULT_FAIL,
       $parsed_results[2]->getResult());
   }
 
   public function testNonVerboseOutput() {
     $stubbed_results = Filesystem::readFile(
       dirname(__FILE__).'/testresults/go.nonverbose');
 
     $parsed_results = id(new ArcanistGoTestResultParser())
       ->parseTestResults('package', $stubbed_results);
 
     $this->assertEqual(2, count($parsed_results));
     $this->assertEqual(
       'Go::TestCase::package::subpackage1',
       $parsed_results[0]->getName());
     $this->assertEqual(
       'Go::TestCase::package::subpackage2',
       $parsed_results[1]->getName());
     foreach ($parsed_results as $result) {
       $this->assertEqual(
         ArcanistUnitTestResult::RESULT_PASS,
         $result->getResult());
     }
   }
 
+  public function testNonVerboseOutputV110() {
+    $stubbed_results = Filesystem::readFile(
+      dirname(__FILE__).'/testresults/go.nonverbose-go1.10');
+
+    $parsed_results = id(new ArcanistGoTestResultParser())
+      ->parseTestResults('package', $stubbed_results);
+
+    $this->assertEqual(2, count($parsed_results));
+    $this->assertEqual(
+      'Go::TestCase::package::subpackage1',
+      $parsed_results[0]->getName());
+    $this->assertEqual(
+      'Go::TestCase::package::subpackage2',
+      $parsed_results[1]->getName());
+    foreach ($parsed_results as $result) {
+      $this->assertEqual(
+        ArcanistUnitTestResult::RESULT_PASS,
+        $result->getResult());
+    }
+  }
+
   public function testSingleTestCaseSuccessfulGo14() {
     $stubbed_results = Filesystem::readFile(
       dirname(__FILE__).'/testresults/go.single-test-case-successful-go1.4');
 
     $parsed_results = id(new ArcanistGoTestResultParser())
       ->parseTestResults('subpackage_test.go', $stubbed_results);
 
     $this->assertEqual(2, count($parsed_results));
     $this->assertEqual(
       'Go::Test::package::subpackage::TestFoo',
       $parsed_results[0]->getName());
     foreach ($parsed_results as $result) {
       $this->assertEqual(
         ArcanistUnitTestResult::RESULT_PASS,
         $result->getResult());
     }
   }
 
   public function testSingleTestCaseFailureGo14() {
     $stubbed_results = Filesystem::readFile(
       dirname(__FILE__).'/testresults/go.single-test-case-failure-go1.4');
 
     $parsed_results = id(new ArcanistGoTestResultParser())
       ->parseTestResults('subpackage_test.go', $stubbed_results);
 
     $this->assertEqual(2, count($parsed_results));
     $this->assertEqual(
       ArcanistUnitTestResult::RESULT_FAIL,
       $parsed_results[0]->getResult());
     $this->assertEqual(
       ArcanistUnitTestResult::RESULT_PASS,
       $parsed_results[1]->getResult());
   }
 
   public function testNonVerboseOutputGo14() {
     $stubbed_results = Filesystem::readFile(
       dirname(__FILE__).'/testresults/go.nonverbose-go1.4');
 
     $parsed_results = id(new ArcanistGoTestResultParser())
       ->parseTestResults('package', $stubbed_results);
 
     $this->assertEqual(2, count($parsed_results));
     $this->assertEqual(
       'Go::TestCase::package::subpackage1',
       $parsed_results[0]->getName());
     $this->assertEqual(
       'Go::TestCase::package::subpackage2',
       $parsed_results[1]->getName());
     foreach ($parsed_results as $result) {
       $this->assertEqual(
         ArcanistUnitTestResult::RESULT_PASS,
         $result->getResult());
     }
   }
 
   public function testMultipleTestCasesSuccessfulGo14() {
     $stubbed_results = Filesystem::readFile(
       dirname(__FILE__).'/testresults/go.multiple-test-cases-successful-go1.4');
 
     $parsed_results = id(new ArcanistGoTestResultParser())
       ->parseTestResults('package', $stubbed_results);
 
     $this->assertEqual(3, count($parsed_results));
     $this->assertEqual(
       'Go::Test::package::subpackage1::TestFoo1',
       $parsed_results[0]->getName());
     $this->assertEqual(
       'Go::Test::package::subpackage2::TestFoo2',
       $parsed_results[2]->getName());
     foreach ($parsed_results as $result) {
       $this->assertEqual(
         ArcanistUnitTestResult::RESULT_PASS,
         $result->getResult());
     }
   }
 
 
   public function testMultipleTestCasesFailureGo14() {
     $stubbed_results = Filesystem::readFile(
       dirname(__FILE__).'/testresults/go.multiple-test-cases-failure-go1.4');
 
     $parsed_results = id(new ArcanistGoTestResultParser())
       ->parseTestResults('package', $stubbed_results);
 
     $this->assertEqual(3, count($parsed_results));
     $this->assertEqual(
       'Go::Test::package::subpackage1::TestFoo1',
       $parsed_results[0]->getName());
     $this->assertEqual(
       'Go::Test::package::subpackage2::TestFoo2',
       $parsed_results[2]->getName());
     $this->assertEqual(
       ArcanistUnitTestResult::RESULT_PASS,
       $parsed_results[0]->getResult());
     $this->assertEqual(
       ArcanistUnitTestResult::RESULT_FAIL,
       $parsed_results[2]->getResult());
   }
 }
diff --git a/src/unit/parser/__tests__/testresults/go.nonverbose-go1.10 b/src/unit/parser/__tests__/testresults/go.nonverbose-go1.10
new file mode 100644
index 00000000..e23664cb
--- /dev/null
+++ b/src/unit/parser/__tests__/testresults/go.nonverbose-go1.10
@@ -0,0 +1,2 @@
+ok  	package/subpackage1	(cached)
+ok  	package/subpackage2	0.010s