diff --git a/integration-tests/byoid/integration_test.go b/integration-tests/byoid/integration_test.go
index da3074c4233..612cf8eae4c 100644
--- a/integration-tests/byoid/integration_test.go
+++ b/integration-tests/byoid/integration_test.go
@@ -443,8 +443,8 @@ func TestConfigurableTokenLifetime(t *testing.T) {
 		}
 
 		now := time.Now()
-		expiryMax := now.Add(tokenLifetimeSeconds * time.Second)
-		expiryMin := expiryMax.Add(-safetyBuffer * time.Second)
+		expiryMax := now.Add((safetyBuffer + tokenLifetimeSeconds) * time.Second)
+		expiryMin := now.Add((tokenLifetimeSeconds - safetyBuffer) * time.Second)
 		if token.Expiry.Before(expiryMin) || token.Expiry.After(expiryMax) {
 			t.Fatalf("Expiry time not set correctly.  Got %v, want %v", token.Expiry, expiryMax)
 		}