diff --git a/pkg/rpaas/client/autoscale.go b/pkg/rpaas/client/autoscale.go
index ef8a7b118..128cc0555 100644
--- a/pkg/rpaas/client/autoscale.go
+++ b/pkg/rpaas/client/autoscale.go
@@ -123,12 +123,7 @@ func (c *client) UpdateAutoscale(ctx context.Context, args UpdateAutoscaleArgs)
 		return err
 	}
 
-	expectedStatus := http.StatusCreated
-	if shouldCreate {
-		expectedStatus = http.StatusOK
-	}
-
-	if resp.StatusCode != expectedStatus {
+	if resp.StatusCode > http.StatusCreated {
 		return newErrUnexpectedStatusCodeFromResponse(resp)
 	}
 
diff --git a/pkg/rpaas/client/internal_client_test.go b/pkg/rpaas/client/internal_client_test.go
index da6851e21..a94d81152 100644
--- a/pkg/rpaas/client/internal_client_test.go
+++ b/pkg/rpaas/client/internal_client_test.go
@@ -117,6 +117,7 @@ func TestNewClientThroughTsuruWithOptions(t *testing.T) {
 				assert.EqualError(t, err, tt.expectedError)
 			} else {
 				require.NoError(t, err)
+				rpaasClient.(*client).client.Transport = nil // void compare
 				assert.Equal(t, tt.expected, rpaasClient.(*client))
 			}
 			if tt.teardown != nil {