--- a/browser/components/shell/HeadlessShell.jsm
+++ b/browser/components/shell/HeadlessShell.jsm
@@ -151,11 +151,12 @@ let HeadlessShell = {
 
       if (URLlist.length == 1) {
         await takeScreenshot(fullWidth, fullHeight, contentWidth, contentHeight, path, URLlist[0]);
       } else {
         dump("expected exactly one URL when using `screenshot`\n");
       }
     } finally {
       Services.startup.exitLastWindowClosingSurvivalArea();
+      Services.startup.quit(Ci.nsIAppStartup.eForceQuit);
     }
   }
 };

--- a/browser/components/shell/test/chrome.ini
+++ b/browser/components/shell/test/chrome.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
 support-files = headless.html
 
 [test_headless_screenshot.html]
-skip-if = (os != 'win' && os != 'linux')
+skip-if = toolkit == 'android'