diff --git a/pkg/cli/apps_test.go b/pkg/cli/apps_test.go
index 8ff1ced..4a83410 100644
--- a/pkg/cli/apps_test.go
+++ b/pkg/cli/apps_test.go
@@ -554,7 +554,7 @@ func TestAppsParamsSetError(t *testing.T) {
 }
 
 func TestAppsParamsSetClassic(t *testing.T) {
-	testClient(t, func(e *cli.Engine, i *mocksdk.Interface) {
+	testClientWait(t, 50*time.Millisecond, func(e *cli.Engine, i *mocksdk.Interface) {
 		i.On("SystemGet").Return(fxSystemClassic(), nil)
 		i.On("AppParametersSet", "app1", map[string]string{"Foo": "bar", "Baz": "qux"}).Return(nil)
 		i.On("AppGet", "app1").Return(fxAppUpdating(), nil).Twice()
diff --git a/pkg/cli/builds_test.go b/pkg/cli/builds_test.go
index 54a4ba9..610a6b6 100644
--- a/pkg/cli/builds_test.go
+++ b/pkg/cli/builds_test.go
@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 	"testing"
+	"time"
 
 	"github.com/convox/convox/pkg/cli"
 	mocksdk "github.com/convox/convox/pkg/mock/sdk"
@@ -16,7 +17,7 @@ import (
 )
 
 func TestBuild(t *testing.T) {
-	testClient(t, func(e *cli.Engine, i *mocksdk.Interface) {
+	testClientWait(t, 50*time.Millisecond, func(e *cli.Engine, i *mocksdk.Interface) {
 		i.On("SystemGet").Return(fxSystem(), nil)
 		i.On("ObjectStore", "app1", mock.AnythingOfType("string"), mock.Anything, structs.ObjectStoreOptions{}).Return(&fxObject, nil).Run(func(args mock.Arguments) {
 			require.Regexp(t, `tmp/[0-9a-f]{30}\.tgz`, args.Get(1).(string))