diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 74807e4728ed..5253d890ef96 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -1441,20 +1441,31 @@ describe('BrowserWindow module', function () {
         w.destroy()
         w = new BrowserWindow()
         w.once('enter-full-screen', () => {
+          assert.equal(w.isFullScreen(), true)
           w.setFullScreen(false)
+        })
+        w.once('leave-full-screen', () => {
           assert.equal(w.isFullScreen(), false)
           done()
         })
         w.setFullScreen(true)
-        assert.equal(w.isFullScreen(), true)
       })
 
-      it('should not be changed by setKiosk method', function () {
+      it('should not be changed by setKiosk method', function (done) {
+        w.destroy()
+        w = new BrowserWindow()
+        w.once('enter-full-screen', () => {
+          assert.equal(w.isFullScreen(), true)
+          w.setKiosk(true)
+          w.setKiosk(false)
+          assert.equal(w.isFullScreen(), true)
+          w.setFullScreen(false)
+        })
+        w.once('leave-full-screen', () => {
+          assert.equal(w.isFullScreen(), false)
+          done()
+        })
         w.setFullScreen(true)
-        assert.equal(w.isFullScreen(), true)
-        w.setKiosk(true)
-        w.setKiosk(false)
-        assert.equal(w.isFullScreen(), true)
       })
     })