diff --git a/src/github.js b/src/github.js
index b437407..b1748f9 100644
--- a/src/github.js
+++ b/src/github.js
@@ -404,10 +404,13 @@ function mod (githubContext, githubToken) {
     do {
       checks = await getPullRequestChecks(number)
       if (checks.length) {
-        const pending = checks.filter(check => check.status === 'in_progress')
+        const pending = checks.filter(check => check.status !== 'completed')
         if (!pending.length) {
           return checks
         }
+      } else {
+        // No checks, nothing to wait for
+        return []
       }
       await new Promise(resolve => setTimeout(resolve, 10000))
     } while (Date.now() - start < maxWait)
diff --git a/test/basic.test.js b/test/basic.test.js
index 521a070..cabdec1 100644
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -39,7 +39,7 @@ describe('basic usage', () => {
     console.log('Artifact written', ret)
 
     // wait a few seconds
-    await new Promise(resolve => setTimeout(resolve, 2000))
+    await new Promise(resolve => setTimeout(resolve, 20 * 2000))
     const newList = await github.artifacts.list()
     console.log('List of Artifacts on Repo', newList)
     assert(newList.length)
@@ -48,5 +48,5 @@ describe('basic usage', () => {
     const downloaded = await github.artifacts.readTextArtifact(ret.id)
     console.log('Read Artifact', downloaded)
     assert(downloaded.fileA.includes('world'))
-  }).timeout(9000)
+  }).timeout(20 * 9000)
 })