diff --git a/test/e2e/puppeteer.js b/test/e2e/puppeteer.js
index 356317afe559ca..827e0b68a8cb69 100644
--- a/test/e2e/puppeteer.js
+++ b/test/e2e/puppeteer.js
@@ -121,7 +121,24 @@ const app = express();
 app.use( express.static( path.resolve() ) );
 const server = app.listen( port, main );
 
-process.on( 'SIGINT', () => close() );
+process.on( 'SIGINT', async () => {
+
+	console.log( '\nInterrupted, cleaning up...' );
+
+	if ( browser ) {
+
+		try {
+
+			await browser.close();
+
+		} catch {}
+
+	}
+
+	server.close();
+	process.exit( 1 );
+
+} );
 
 async function main() {