diff --git a/internal/tests/api/credentials/credentials_test.go b/internal/tests/api/credentials/credentials_test.go
index 4700fc81a..c754c3f8f 100644
--- a/internal/tests/api/credentials/credentials_test.go
+++ b/internal/tests/api/credentials/credentials_test.go
@@ -4,6 +4,7 @@
 package credentials_test
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"testing"
@@ -493,6 +494,8 @@ func TestUpdateAfterKeyRotation(t *testing.T) {
 	// Should start asynchronous rewrapping of the encrypted JSON credential
 	assert.Equal("pending", result.State)
 
+	ctx, cancel := context.WithTimeout(ctx, time.Minute)
+	defer cancel()
 	for {
 		jobs, err := scopesClient.ListKeyVersionDestructionJobs(ctx, proj.PublicId)
 		require.NoError(err)
@@ -501,6 +504,7 @@ func TestUpdateAfterKeyRotation(t *testing.T) {
 		}
 		select {
 		case <-ctx.Done():
+			t.Fatalf("Timed out waiting for key version destruction job, got jobs: %#v", jobs.Items)
 			break
 		case <-time.After(time.Millisecond * 100):
 		}