diff --git a/spec/main.js b/spec/main.js
index 41c2945f6843..b3b4b4dac0e8 100644
--- a/spec/main.js
+++ b/spec/main.js
@@ -3,6 +3,14 @@ var BrowserWindow = require('browser-window');
 
 var window = null;
 
+process.on('uncaughtException', function() {
+  window.openDevTools();
+});
+
+app.on('window-all-closed', function() {
+  app.terminate();
+});
+
 app.on('finish-launching', function() {
   window = new BrowserWindow({
     title: 'atom-shell tests',