diff --git a/src/main.cc b/src/main.cc
index 6a54ef6e295f580ba972ee9d4f14abd0a3c75412..3712d74a169bd04ea366819eef615a158f9705a2 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -125,7 +125,16 @@ int main(int argc, char *argv[])
         _CrtSetReportHook(WindowsCrtReportHook);
 #endif
     }
+
+#ifdef Q_OS_WIN
+    if (runUnitTests) {
+        // Don't pop up Windows Error Reporting dialog when app crashes. This prevents TeamCity from
+        // hanging.
+        DWORD dwMode = SetErrorMode(SEM_NOGPFAULTERRORBOX);
+        SetErrorMode(dwMode | SEM_NOGPFAULTERRORBOX);
+    }
 #endif
+#endif // QT_DEBUG
     
     QGCApplication* app = new QGCApplication(argc, argv, runUnitTests);
     Q_CHECK_PTR(app);