diff --git a/internal/cmd/deploy/deploy.go b/internal/cmd/deploy/deploy.go
index 671b866e..09a996ed 100644
--- a/internal/cmd/deploy/deploy.go
+++ b/internal/cmd/deploy/deploy.go
@@ -101,10 +101,8 @@ To list and delete changesets, use the ls and rm commands.
 
 			var suppliedStackName string
 
-			if len(args) == 2 {
+			if len(args) >= 2 {
 				suppliedStackName = args[1]
-			} else {
-				suppliedStackName = ""
 			}
 
 			// Optionally name the change set
diff --git a/scripts/integ.sh b/scripts/integ.sh
index 674c7533..11085b15 100755
--- a/scripts/integ.sh
+++ b/scripts/integ.sh
@@ -18,6 +18,17 @@ set -eoux pipefail
 
 ./rain rm success-test -y
 
+# Unnamed stack
+./rain deploy test/templates/success.template -y --params BucketName=ezbeardatamazon-rain-test-1
+./rain cat success
+./rain ls success
+./rain rm -y success
+
+# Change sets
+./rain deploy --no-exec test/templates/success.template success-test success-changeset-name -y --params BucketName=ezbeardatamazon-rain-test-1
+./rain ls -c success-test success-changeset-name
+./rain rm -c -y success-test success-changeset-name
+
 ./rain build AWS::S3::Bucket
 ./rain build -l