diff --git a/autoload/go/test-fixtures/test/src/timeout/timeout_test.go b/autoload/go/test-fixtures/test/src/timeout/timeout_test.go
new file mode 100644
index 0000000000..502c39e878
--- /dev/null
+++ b/autoload/go/test-fixtures/test/src/timeout/timeout_test.go
@@ -0,0 +1,47 @@
+// Run a few parallel tests, all in parallel, using multiple techniques for
+// causing the test to take a while so that the stacktraces resulting from a
+// test timeout will contain several goroutines to avoid giving a false sense
+// of confidence or creating error formats that don't account for the more
+// complex scenarios that can occur with timeouts.
+
+package main
+
+import (
+	"testing"
+	"time"
+)
+
+func TestSleep(t *testing.T) {
+	t.Parallel()
+	time.Sleep(15 * time.Second)
+	t.Log("expected panic if run with timeout < 15s")
+}
+
+func TestRunning(t *testing.T) {
+	t.Parallel()
+	c := time.After(15 * time.Second)
+Loop:
+	for {
+		select {
+		case <-c:
+			break Loop
+		default:
+		}
+	}
+
+	t.Log("expected panic if run with timeout < 15s")
+}
+
+func TestRunningAlso(t *testing.T) {
+	t.Parallel()
+	c := time.After(15 * time.Second)
+Loop:
+	for {
+		select {
+		case <-c:
+			break Loop
+		default:
+		}
+	}
+	t.Log("expected panic if run with timeout < 15s")
+}
diff --git a/autoload/go/test.vim b/autoload/go/test.vim
index 4606ad4820..77de828bbe 100644
--- a/autoload/go/test.vim
+++ b/autoload/go/test.vim
@@ -318,6 +318,10 @@ function! s:errorformat() abort
 
   " set the format for panics.
 
+  " handle panics from test timeouts
+  let format .= ",%+Gpanic: test timed out after %.%\\+"
+
+  " handle non-timeout panics
   " In addition to 'panic', check for 'fatal error' to support older versions
   " of Go that used 'fatal error'.
   "
diff --git a/autoload/go/test_test.vim b/autoload/go/test_test.vim
index e9ab1623fc..116c377ae4 100644
--- a/autoload/go/test_test.vim
+++ b/autoload/go/test_test.vim
@@ -47,6 +47,16 @@ func! Test_GoTestCompilerError() abort
   call s:test('compilerror/compilerror_test.go', expected)
 endfunc
 
+func! Test_GoTestTimeout() abort
+  let expected = [
+        \ {'lnum': 0, 'bufnr': 0, 'col': 0, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'text': 'panic: test timed out after 500ms'}
+      \ ]
+
+  let g:go_test_timeout="500ms"
+  call s:test('timeout/timeout_test.go', expected)
+  unlet g:go_test_timeout
+endfunc
+
 func! s:test(file, expected, ...) abort
   if has('nvim')
     " nvim mostly shows test errors correctly, but the the expected errors are