diff --git a/Makefile b/Makefile
index 45d7d59e2..ace8e28ed 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ clean:
 	rm -rf .egg stacker.egg-info
 
 test-functional:
-	cd tests && bats .
+	cd tests && bats test_suite
 
 # General testing target for most development.
 test: lint test-unit test-unit3
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 000000000..06b5fa413
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,8 @@
+permissions:
+	./stacker.yaml.sh | stacker build -
+
+test: permissions
+	$(eval AWS_ACCESS_KEY_ID := $(shell ./stacker.yaml.sh | stacker info - 2>&1 | awk '/AccessKeyId/ {print $$3}'))
+	$(eval AWS_SECRET_ACCESS_KEY := $(shell ./stacker.yaml.sh | stacker info - 2>&1 | awk '/SecretAccessKey/ {print $$3}'))
+	$(eval STACKER_ROLE := $(shell ./stacker.yaml.sh | stacker info - 2>&1 | awk '/FunctionalTestRole/ {print $$3}'))
+	@STACKER_ROLE=$(STACKER_ROLE) AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) ./run_test_suite.sh ${TESTS}
diff --git a/tests/README.md b/tests/README.md
index e41ab87f8..441ae03ba 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,4 +1,4 @@
-This directory contains the functional testing suite for stacker. It exercises all of stacker against a real AWS account.
+This directory contains the functional testing suite for stacker. It exercises all of stacker against a real AWS account. Make sure you have the AWS credentials loaded into your environment when you run these steps.
 
 ## Setup
 
@@ -7,27 +7,26 @@ This directory contains the functional testing suite for stacker. It exercises a
   ```console
   $ source venv/bin/activate
   ```
+
 2. Set a stacker namespace & the AWS region for the test suite to use:
 
   ```console
   $ export STACKER_NAMESPACE=my-stacker-test-namespace
+  $ export AWS_DEFAULT_REGION=us-east-1
   ```
-3. Generate an IAM user for the test suite to use:
 
-  ```console
-  $ ./stacker.yaml.sh | stacker build -
-  ```
-4. Grab the generated key pair for the user and set it in your shell:
+3. Ensure that bats is installed:
 
   ```console
-  $ ./stacker.yaml.sh | stacker info -
-  $ export AWS_ACCESS_KEY_ID=access-key
-  $ export AWS_SECRET_ACCESS_KEY=secret-access-key
-  $ export STACKER_ROLE=<FunctionalTestRole>
+  # On MacOS if brew is installed
+  $ brew install bats
   ```
-5. Run the test suite:
+
+4. Setup functional test environment & run tests:
 
   ```console
-  $ brew install bats
-  $ bats .
+  # To run all the tests
+  $ make -C tests test
+  # To run specific tests (ie: tests 1, 2 and 3)
+  $ TESTS="1 2 3" make -C tests test
   ```
diff --git a/tests/run_test_suite.sh b/tests/run_test_suite.sh
new file mode 100755
index 000000000..22a97844d
--- /dev/null
+++ b/tests/run_test_suite.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+TEST_ARGS=$*
+
+if [ -z "$TEST_ARGS" ]
+then
+    _TESTS="test_suite"
+else
+    for T in ${TEST_ARGS}
+    do
+        _TESTS="${_TESTS} test_suite/$(printf %02d ${T})_*"
+    done
+fi
+
+echo "bats ${_TESTS}"
+
+bats ${_TESTS}
diff --git a/tests/suite.bats b/tests/suite.bats
deleted file mode 100755
index 7e24cac05..000000000
--- a/tests/suite.bats
+++ /dev/null
@@ -1,1064 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "stacker build - no config" {
-  stacker build
-  assert ! "$status" -eq 0
-  assert_has_line -E "too few arguments|the following arguments are required: config"
-}
-
-@test "stacker build - empty config" {
-  stacker build <(echo "")
-  assert ! "$status" -eq 0
-  assert_has_line 'Should have more than one element'
-}
-
-@test "stacker build - config with no stacks" {
-  stacker build - <<EOF
-namespace: ${STACKER_NAMESPACE}
-EOF
-  assert ! "$status" -eq 0
-  assert_has_line 'Should have more than one element'
-}
-
-@test "stacker build - config with no namespace" {
-  stacker build - <<EOF
-stacker_bucket: stacker-${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.VPC
-EOF
-  assert ! "$status" -eq 0
-  assert_has_line "This field is required"
-}
-
-@test "stacker build - missing environment key" {
-  environment() {
-    cat <<EOF
-vpc_private_subnets: 10.128.8.0/22,10.128.12.0/22,10.128.16.0/22,10.128.20.0/22
-EOF
-  }
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.VPC
-    variables:
-      PublicSubnets: \${vpc_public_subnets}
-      PrivateSubnets: \${vpc_private_subnets
-EOF
-  }
-
-  # Create the new stacks.
-  stacker build <(environment) <(config)
-  assert ! "$status" -eq 0
-  assert_has_line "stacker.exceptions.MissingEnvironment: Environment missing key vpc_public_subnets."
-}
-
-@test "stacker build - duplicate stacks" {
-  stacker build - <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.VPC
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-EOF
-  assert ! "$status" -eq 0
-  assert_has_line "Duplicate stack vpc found"
-}
-
-@test "stacker graph - json format" {
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-  - name: bastion1
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
-    variables:
-      StringVariable: \${output vpc::DummyId}
-  - name: bastion2
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    variables:
-      StringVariable: \${output vpc::DummyId}
-  - name: app1
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
-    variables:
-      StringVariable: \${output bastion1::DummyId}
-  - name: app2
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    variables:
-      StringVariable: \${output bastion2::DummyId}
-EOF
-  }
-
-  # Print the graph
-  stacker graph -f json <(config)
-  assert "$status" -eq 0
-  assert $(echo "$output" | grep -v "Using default" | python -c "import sys, json; data = json.loads(sys.stdin.read()); print(data['steps']['vpc']['deps'] == [] and data['steps']['bastion1']['deps'] == ['vpc'] and data['steps']['app2']['deps'] == ['bastion2'])") = 'True'
-}
-
-@test "stacker graph - dot format" {
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-  - name: bastion1
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
-    variables:
-      StringVariable: \${output vpc::DummyId}
-  - name: bastion2
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    variables:
-      StringVariable: \${output vpc::DummyId}
-  - name: app1
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
-    variables:
-      StringVariable: \${output bastion1::DummyId}
-  - name: app2
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    variables:
-      StringVariable: \${output bastion2::DummyId}
-EOF
-  }
-
-  # Print the graph
-  stacker graph -f dot <(config)
-  assert "$status" -eq 0
-  assert_has_line '"bastion1" -> "vpc";'
-  assert_has_line '"bastion2" -> "vpc";'
-  assert_has_line '"app1" -> "bastion1";'
-  assert_has_line '"app2" -> "bastion2";'
-  assert $(echo "$output" | grep -A 2 vpc | tail -n 2 | grep -c vpc) = '0'
-}
-
-@test "stacker build - missing variable" {
-  needs_aws
-
-  stacker build - <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.VPC
-EOF
-  assert ! "$status" -eq 0
-  assert_has_line -E 'MissingVariable: Variable "(PublicSubnets|PrivateSubnets)" in blueprint "vpc" is missing'
-  assert_has_line -E 'vpc: failed \(Variable "(PublicSubnets|PrivateSubnets)" in blueprint "vpc" is missing\)'
-}
-
-@test "stacker build - simple build" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.VPC
-    stack_policy: tests/fixtures/stack_policies/default.json
-    variables:
-      PublicSubnets: 10.128.0.0/24,10.128.1.0/24,10.128.2.0/24,10.128.3.0/24
-      PrivateSubnets: 10.128.8.0/22,10.128.12.0/22,10.128.16.0/22,10.128.20.0/22
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # Create the new stacks.
-  stacker build <(config)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "vpc: submitted (creating new stack)"
-  assert_has_line "vpc: complete (creating new stack)"
-
-  # Perform a noop update to the stacks, in interactive mode.
-  stacker build -i <(config)
-  assert "$status" -eq 0
-  assert_has_line "Using interactive AWS provider mode"
-  assert_has_line "vpc: skipped (nochange)"
-
-  # Cleanup
-  stacker destroy --force <(config)
-  assert "$status" -eq 0
-  assert_has_line "vpc: submitted (submitted for destruction)"
-  assert_has_line "vpc: complete (stack destroyed)"
-}
-
-@test "stacker info - simple info" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # Create the new stacks.
-  stacker build <(config)
-  assert "$status" -eq 0
-
-  stacker info <(config)
-  assert "$status" -eq 0
-  assert_has_line "Outputs for stacks: ${STACKER_NAMESPACE}"
-  assert_has_line "vpc:"
-  assert_has_line "DummyId: dummy-1234"
-}
-
-@test "stacker build - simple build with output lookups" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-  - name: bastion
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    variables:
-      StringVariable: \${output vpc::DummyId}
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # Create the new stacks.
-  stacker build <(config)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-
-  for stack in vpc bastion; do
-    assert_has_line "${stack}: submitted (creating new stack)"
-    assert_has_line "${stack}: complete (creating new stack)"
-  done
-}
-
-@test "stacker build - simple build with environment" {
-  needs_aws
-
-  environment() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-vpc_public_subnets: 10.128.0.0/24,10.128.1.0/24,10.128.2.0/24,10.128.3.0/24
-vpc_private_subnets: 10.128.8.0/22,10.128.12.0/22,10.128.16.0/22,10.128.20.0/22
-EOF
-  }
-
-  config() {
-    cat <<EOF
-namespace: \${namespace}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.VPC
-    variables:
-      PublicSubnets: \${vpc_public_subnets}
-      PrivateSubnets: \${vpc_private_subnets
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(environment) <(config)
-  }
-
-  # Create the new stacks.
-  stacker build <(environment) <(config)
-  assert "$status" -eq 0
-}
-
-@test "stacker build - interactive with skipped update" {
-  needs_aws
-
-  config1() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-  - name: bastion
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    variables:
-      StringVariable: \${output vpc::DummyId}
-EOF
-  }
-
-  config2() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
-  - name: bastion
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
-    requires: [vpc]
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config1)
-  }
-
-  # Create the new stacks.
-  stacker build <(config1)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "vpc: submitted (creating new stack)"
-  assert_has_line "vpc: complete (creating new stack)"
-  assert_has_line "bastion: submitted (creating new stack)"
-  assert_has_line "bastion: complete (creating new stack)"
-
-  # Attempt an update to all stacks, but skip the vpc update.
-  stacker build -i <(config2) <<< $'n\ny\n'
-  assert "$status" -eq 0
-  assert_has_line "vpc: skipped (canceled execution)"
-  assert_has_line "bastion: submitted (updating existing stack)"
-}
-
-@test "stacker build - no namespace" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ""
-stacks:
-  - name: vpc
-    stack_name: ${STACKER_NAMESPACE}-vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # Create the new stacks.
-  stacker build <(config)
-  assert "$status" -eq 0
-}
-
-@test "stacker build - overriden environment key with -e" {
-  needs_aws
-
-  environment() {
-    cat <<EOF
-namespace: stacker
-EOF
-  }
-
-  config() {
-    cat <<EOF
-namespace: \${namespace}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.VPC
-    variables:
-      PublicSubnets: 10.128.0.0/24,10.128.1.0/24,10.128.2.0/24,10.128.3.0/24
-      PrivateSubnets: 10.128.8.0/22,10.128.12.0/22,10.128.16.0/22,10.128.20.0/22
-EOF
-  }
-
-  teardown() {
-    stacker destroy -e namespace=$STACKER_NAMESPACE --force <(environment) <(config)
-  }
-
-  # Create the new stacks.
-  stacker build -e namespace=$STACKER_NAMESPACE <(environment) <(config)
-  assert "$status" -eq 0
-  assert_has_line "vpc: submitted (creating new stack)"
-}
-
-@test "stacker build - dump" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-  - name: bastion
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    variables:
-      StringVariable: \${output vpc::DummyId}
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # Create the new stacks.
-  stacker build <(config)
-  assert "$status" -eq 0
-
-  stacker build -d "$TMP" <(config)
-  assert "$status" -eq 0
-}
-
-@test "stacker diff - simple diff with output lookups" {
-  needs_aws
-
-  config1() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.DiffTester
-    variables:
-      InstanceType: m3.large
-      WaitConditionCount: 1
-EOF
-  }
-
-  config2() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.DiffTester
-    variables:
-      InstanceType: m3.xlarge
-      WaitConditionCount: 2
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config1)
-  }
-
-  # Create the new stacks.
-  stacker build <(config1)
-  assert "$status" -eq 0
-
-  stacker diff <(config2)
-  assert "$status" -eq 0
-  assert_has_line "\-InstanceType = m3.large"
-  assert_has_line "+InstanceType = m3.xlarge"
-  assert_has_line "+         \"VPC1\": {"
-  assert_has_line "+             \"Type\": \"AWS::CloudFormation::WaitConditionHandle\""
-}
-
-@test "stacker build - replacements-only test with additional resource, no keyerror" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: add-resource-test-with-replacements-only
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-
-EOF
-  }
-
-config2() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: add-resource-test-with-replacements-only
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
-
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # Create the new stacks.
-  stacker build <(config)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "add-resource-test-with-replacements-only: submitted (creating new stack)"
-  assert_has_line "add-resource-test-with-replacements-only: complete (creating new stack)"
-
-  # Perform a additional resouce addition in replacements-only mode, should not crash.  This is testing issue #463.
-  stacker build -i --replacements-only <(config2)
-  assert "$status" -eq 0
-  assert_has_line "Using interactive AWS provider mode"
-  assert_has_line "add-resource-test-with-replacements-only: complete (updating existing stack)"
-
-  # Cleanup
-  stacker destroy --force <(config2)
-  assert "$status" -eq 0
-  assert_has_line "add-resource-test-with-replacements-only: submitted (submitted for destruction)"
-  assert_has_line "add-resource-test-with-replacements-only: complete (stack destroyed)"
-}
-
-@test "stacker build - locked stacks" {
-  needs_aws
-
-  config1() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-EOF
-  }
-
-  config2() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    locked: true
-  - name: bastion
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    variables:
-      StringVariable: \${output vpc::DummyId}
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config2)
-  }
-
-  stacker build <(config2)
-  assert "$status" -eq 1
-  assert_has_line "AttributeError: Stack does not have a defined class or template path."
-
-  # Create the new stacks.
-  stacker build <(config1)
-  assert "$status" -eq 0
-
-  stacker build <(config2)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "vpc: skipped (locked)"
-  assert_has_line "bastion: submitted (creating new stack)"
-  assert_has_line "bastion: complete (creating new stack)"
-}
-
-@test "stacker build - default mode, without & with protected stack" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: mystack
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    protected: ${PROTECTED}
-
-EOF
-  }
-
-  config2() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: mystack
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
-  
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # First create the stack
-  stacker build --interactive <(PROTECTED="false" config)
-  assert "$status" -eq 0
-  assert_has_line "Using interactive AWS provider mode"
-  assert_has_line "mystack: submitted (creating new stack)"
-  assert_has_line "mystack: complete (creating new stack)"
-
-  # Perform a additional resouce addition in interactive mode, non-protected stack
-  stacker build --interactive <(config2) < <(echo "y")
-  assert "$status" -eq 0
-  assert_has_line "Using interactive AWS provider mode"
-  assert_has_line "mystack: submitted (updating existing stack)"
-  assert_has_line "mystack: complete (updating existing stack)"
-  assert_has_line "Add Dummy2"
-
-  # Perform another update, this time without interactive, but with a protected stack
-  stacker build <(PROTECTED="true" config) < <(echo "y")
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "mystack: submitted (updating existing stack)"
-  assert_has_line "mystack: complete (updating existing stack)"
-  assert_has_line "Remove Dummy2"
-
-  # Cleanup
-  stacker destroy --force <(config2)
-  assert "$status" -eq 0
-  assert_has_line "mystack: submitted (submitted for destruction)"
-  assert_has_line "mystack: complete (stack destroyed)"
-}
-
-@test "stacker build - recreate failed stack, non-interactive mode" {
-  needs_aws
-
-  bad_config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: recreate-failed
-    class_path: stacker.tests.fixtures.mock_blueprints.Broken
-
-EOF
-  }
-
-  good_config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: recreate-failed
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(good_config)
-  }
-
-  stacker destroy --force <(good_config)
-
-  # Create the initial stack. This must fail.
-  stacker build <(bad_config)
-  assert "$status" -eq 1
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "recreate-failed: submitted (creating new stack)"
-  assert_has_line "recreate-failed: failed (rolled back new stack)"
-
-  # Updating the stack should prompt to re-create it.
-  stacker build --recreate-failed <(good_config)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "recreate-failed: submitted (destroying stack for re-creation)"
-  assert_has_line "recreate-failed: submitted (creating new stack)"
-  assert_has_line "recreate-failed: complete (creating new stack)"
-
-  # Confirm the stack is really updated
-  stacker build <(good_config)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "recreate-failed: skipped (nochange)"
-
-  # Cleanup
-  stacker destroy --force <(good_config)
-  assert "$status" -eq 0
-  assert_has_line "recreate-failed: submitted (submitted for destruction)"
-  assert_has_line "recreate-failed: complete (stack destroyed)"
-}
-
-
-@test "stacker build - recreate failed stack, interactive mode" {
-  needs_aws
-
-  bad_config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: recreate-failed-interactive
-    class_path: stacker.tests.fixtures.mock_blueprints.Broken
-
-EOF
-  }
-
-  good_config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: recreate-failed-interactive
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(good_config)
-  }
-
-  stacker destroy --force <(good_config)
-
-  # Create the initial stack. This must fail.
-  stacker build <(bad_config)
-  assert "$status" -eq 1
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "recreate-failed-interactive: submitted (creating new stack)"
-  assert_has_line "recreate-failed-interactive: failed (rolled back new stack)"
-
-  # Updating the stack should prompt to re-create it.
-  stacker build -i <(good_config) <<< $'y\n'
-  assert "$status" -eq 0
-  assert_has_line "Using interactive AWS provider mode"
-  assert_has_line "recreate-failed-interactive: submitted (destroying stack for re-creation)"
-  assert_has_line "recreate-failed-interactive: submitted (creating new stack)"
-  assert_has_line "recreate-failed-interactive: complete (creating new stack)"
-
-  # Confirm the stack is really updated
-  stacker build -i <(good_config)
-  assert "$status" -eq 0
-  assert_has_line "Using interactive AWS provider mode"
-  assert_has_line "recreate-failed-interactive: skipped (nochange)"
-
-  # Cleanup
-  stacker destroy --force <(good_config)
-  assert "$status" -eq 0
-  assert_has_line "recreate-failed-interactive: submitted (submitted for destruction)"
-  assert_has_line "recreate-failed-interactive: complete (stack destroyed)"
-}
-
-@test "stacker build - handle rollbacks during updates" {
-  needs_aws
-
-  bad_config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: update-rollback
-    class_path: stacker.tests.fixtures.mock_blueprints.Broken
-
-EOF
-  }
-
-  good_config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: update-rollback
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-
-EOF
-  }
-
-  good_config2() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: update-rollback
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
-
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(good_config)
-  }
-
-  stacker destroy --force <(good_config)
-
-  # Create the initial stack
-  stacker build <(good_config)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "update-rollback: submitted (creating new stack)"
-  assert_has_line "update-rollback: complete (creating new stack)"
-
-  # Do a bad update and watch the rollback
-  stacker build <(bad_config)
-  assert "$status" -eq 1
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "update-rollback: submitted (updating existing stack)"
-  assert_has_line "update-rollback: submitted (rolling back update)"
-  assert_has_line "update-rollback: failed (rolled back update)"
-
-  # Do a good update so we know we've correctly waited for rollback
-  stacker build <(good_config2)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "update-rollback: submitted (updating existing stack)"
-  assert_has_line "update-rollback: complete (updating existing stack)"
-}
-
-
-@test "stacker build - handle rollbacks in dependent stacks" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: dependent-rollback-parent
-    class_path: stacker.tests.fixtures.mock_blueprints.Broken
-
-  - name: dependent-rollback-child
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    requires: [dependent-rollback-parent]
-
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  stacker destroy --force <(config)
-
-  # Verify both stacks fail during creation
-  stacker build <(config)
-  assert "$status" -eq 1
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "dependent-rollback-parent: submitted (creating new stack)"
-  assert_has_line "dependent-rollback-parent: submitted (rolling back new stack)"
-  assert_has_line "dependent-rollback-parent: failed (rolled back new stack)"
-  assert_has_line "dependent-rollback-child: failed (dependency has failed)"
-  assert_has_line "The following steps failed: dependent-rollback-parent, dependent-rollback-child"
-}
-
-@test "stacker build - raw template" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    template_path: ../stacker/tests/fixtures/cfn_template.json
-    variables:
-      Param1: foobar
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # Create the new stacks.
-  stacker build <(config)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "vpc: submitted (creating new stack)"
-  assert_has_line "vpc: complete (creating new stack)"
-
-  # Perform a noop update to the stacks, in interactive mode.
-  stacker build -i <(config)
-  assert "$status" -eq 0
-  assert_has_line "Using interactive AWS provider mode"
-  assert_has_line "vpc: skipped (nochange)"
-
-  # Cleanup
-  stacker destroy --force <(config)
-  assert "$status" -eq 0
-  assert_has_line "vpc: submitted (submitted for destruction)"
-  assert_has_line "vpc: complete (stack destroyed)"
-}
-
-@test "stacker diff - raw template" {
-  needs_aws
-
-  config1() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    template_path: ../stacker/tests/fixtures/cfn_template.json
-    variables:
-      Param1: foobar
-EOF
-  }
-
-  config2() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    template_path: ../stacker/tests/fixtures/cfn_template.json
-    variables:
-      Param1: newbar
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config1)
-  }
-
-  # Create the new stacks.
-  stacker build <(config1)
-  assert "$status" -eq 0
-
-  stacker diff <(config2)
-  assert "$status" -eq 0
-  assert_has_line "\-Param1 = foobar"
-  assert_has_line "+Param1 = newbar"
-}
-
-@test "stacker build - no parallelism" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc1
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-  - name: vpc2
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # Create the new stacks.
-  stacker build -j 1 <(config)
-  assert "$status" -eq 0
-  assert_has_line "vpc1: submitted (creating new stack)"
-  assert_has_line "vpc1: complete (creating new stack)"
-  assert_has_line "vpc2: submitted (creating new stack)"
-  assert_has_line "vpc2: complete (creating new stack)"
-}
-
-@test "stacker build - tailing" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-  - name: bastion
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    requires: [vpc]
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # Create the new stacks.
-  stacker build --tail <(config)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "Tailing stack: ${STACKER_NAMESPACE}-vpc"
-  assert_has_line "vpc: submitted (creating new stack)"
-  assert_has_line "vpc: complete (creating new stack)"
-  assert_has_line "Tailing stack: ${STACKER_NAMESPACE}-bastion"
-  assert_has_line "bastion: submitted (creating new stack)"
-  assert_has_line "bastion: complete (creating new stack)"
-
-  stacker destroy --force --tail <(config)
-  assert "$status" -eq 0
-}
-
-@test "stacker build - override stack name" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    stack_name: vpcx
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-  - name: bastion
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    variables:
-      StringVariable: \${output vpc::DummyId}
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # Create the new stacks.
-  stacker build <(config)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "vpc: submitted (creating new stack)"
-  assert_has_line "vpc: complete (creating new stack)"
-  assert_has_line "bastion: submitted (creating new stack)"
-  assert_has_line "bastion: complete (creating new stack)"
-}
-
-@test "stacker build - multi region" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: west/vpc
-    region: us-west-1
-    stack_name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-  - name: east/vpc
-    region: us-east-1
-    stack_name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-  - name: app
-    region: us-east-1
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-    variables:
-      StringVariable: \${output west/vpc::DummyId}
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # Create the new stacks.
-  stacker build <(config)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "vpc: submitted (creating new stack)"
-  assert_has_line "vpc: complete (creating new stack)"
-  assert_has_line "app: submitted (creating new stack)"
-  assert_has_line "app: complete (creating new stack)"
-
-  config_simple() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: west/vpc
-    region: us-west-1
-    stack_name: vpc
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-EOF
-  }
-
-  # Assert that the vpc stack was built in us-west-1
-  stacker info <(config_simple)
-  assert_has_line "Region: us-west-1"
-}
-
-@test "stacker build - profiles" {
-  needs_aws
-
-  config() {
-    cat <<EOF
-namespace: ${STACKER_NAMESPACE}
-stacks:
-  - name: vpc
-    profile: stacker
-    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
-EOF
-  }
-
-  teardown() {
-    stacker destroy --force <(config)
-  }
-
-  # Create the new stacks.
-  stacker build <(config)
-  assert "$status" -eq 0
-  assert_has_line "Using default AWS provider mode"
-  assert_has_line "vpc: submitted (creating new stack)"
-  assert_has_line "vpc: complete (creating new stack)"
-}
diff --git a/tests/test_suite/01_stacker_build_no_config.bats b/tests/test_suite/01_stacker_build_no_config.bats
new file mode 100644
index 000000000..6acf7208f
--- /dev/null
+++ b/tests/test_suite/01_stacker_build_no_config.bats
@@ -0,0 +1,9 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - no config" {
+  stacker build
+  assert ! "$status" -eq 0
+  assert_has_line -E "too few arguments|the following arguments are required: config"
+}
diff --git a/tests/test_suite/02_stacker_build_empty_config.bats b/tests/test_suite/02_stacker_build_empty_config.bats
new file mode 100644
index 000000000..589672312
--- /dev/null
+++ b/tests/test_suite/02_stacker_build_empty_config.bats
@@ -0,0 +1,9 @@
+#!/usr/bin/env bats
+#
+load ../test_helper
+
+@test "stacker build - empty config" {
+  stacker build <(echo "")
+  assert ! "$status" -eq 0
+  assert_has_line 'Should have more than one element'
+}
diff --git a/tests/test_suite/03_stacker_build-config_with_no_stacks.bats b/tests/test_suite/03_stacker_build-config_with_no_stacks.bats
new file mode 100644
index 000000000..cb538e1a9
--- /dev/null
+++ b/tests/test_suite/03_stacker_build-config_with_no_stacks.bats
@@ -0,0 +1,11 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - config with no stacks" {
+  stacker build - <<EOF
+namespace: ${STACKER_NAMESPACE}
+EOF
+  assert ! "$status" -eq 0
+  assert_has_line 'Should have more than one element'
+}
diff --git a/tests/test_suite/04_stacker_build-config_with_no_namespace.bats b/tests/test_suite/04_stacker_build-config_with_no_namespace.bats
new file mode 100644
index 000000000..e88e04a8a
--- /dev/null
+++ b/tests/test_suite/04_stacker_build-config_with_no_namespace.bats
@@ -0,0 +1,14 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - config with no namespace" {
+  stacker build - <<EOF
+stacker_bucket: stacker-${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.VPC
+EOF
+  assert ! "$status" -eq 0
+  assert_has_line "This field is required"
+}
diff --git a/tests/test_suite/05_stacker_build-missing_environment_key.bats b/tests/test_suite/05_stacker_build-missing_environment_key.bats
new file mode 100644
index 000000000..ad0473cb4
--- /dev/null
+++ b/tests/test_suite/05_stacker_build-missing_environment_key.bats
@@ -0,0 +1,28 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - missing environment key" {
+  environment() {
+    cat <<EOF
+vpc_private_subnets: 10.128.8.0/22,10.128.12.0/22,10.128.16.0/22,10.128.20.0/22
+EOF
+  }
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.VPC
+    variables:
+      PublicSubnets: \${vpc_public_subnets}
+      PrivateSubnets: \${vpc_private_subnets
+EOF
+  }
+
+  # Create the new stacks.
+  stacker build <(environment) <(config)
+  assert ! "$status" -eq 0
+  assert_has_line "stacker.exceptions.MissingEnvironment: Environment missing key vpc_public_subnets."
+}
diff --git a/tests/test_suite/06_stacker_build-duplicate_stacks.bats b/tests/test_suite/06_stacker_build-duplicate_stacks.bats
new file mode 100644
index 000000000..c084b3307
--- /dev/null
+++ b/tests/test_suite/06_stacker_build-duplicate_stacks.bats
@@ -0,0 +1,16 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - duplicate stacks" {
+  stacker build - <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.VPC
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+EOF
+  assert ! "$status" -eq 0
+  assert_has_line "Duplicate stack vpc found"
+}
diff --git a/tests/test_suite/07_stacker_graph-json_format.bats b/tests/test_suite/07_stacker_graph-json_format.bats
new file mode 100644
index 000000000..effcfe839
--- /dev/null
+++ b/tests/test_suite/07_stacker_graph-json_format.bats
@@ -0,0 +1,35 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker graph - json format" {
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+  - name: bastion1
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
+    variables:
+      StringVariable: \${output vpc::DummyId}
+  - name: bastion2
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    variables:
+      StringVariable: \${output vpc::DummyId}
+  - name: app1
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
+    variables:
+      StringVariable: \${output bastion1::DummyId}
+  - name: app2
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    variables:
+      StringVariable: \${output bastion2::DummyId}
+EOF
+  }
+
+  # Print the graph
+  stacker graph -f json <(config)
+  assert "$status" -eq 0
+  assert $(echo "$output" | grep -v "Using default" | python -c "import sys, json; data = json.loads(sys.stdin.read()); print(data['steps']['vpc']['deps'] == [] and data['steps']['bastion1']['deps'] == ['vpc'] and data['steps']['app2']['deps'] == ['bastion2'])") = 'True'
+}
diff --git a/tests/test_suite/08_stacker_graph-dot_format.bats b/tests/test_suite/08_stacker_graph-dot_format.bats
new file mode 100644
index 000000000..61c6e98ee
--- /dev/null
+++ b/tests/test_suite/08_stacker_graph-dot_format.bats
@@ -0,0 +1,39 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker graph - dot format" {
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+  - name: bastion1
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
+    variables:
+      StringVariable: \${output vpc::DummyId}
+  - name: bastion2
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    variables:
+      StringVariable: \${output vpc::DummyId}
+  - name: app1
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
+    variables:
+      StringVariable: \${output bastion1::DummyId}
+  - name: app2
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    variables:
+      StringVariable: \${output bastion2::DummyId}
+EOF
+  }
+
+  # Print the graph
+  stacker graph -f dot <(config)
+  assert "$status" -eq 0
+  assert_has_line '"bastion1" -> "vpc";'
+  assert_has_line '"bastion2" -> "vpc";'
+  assert_has_line '"app1" -> "bastion1";'
+  assert_has_line '"app2" -> "bastion2";'
+  assert $(echo "$output" | grep -A 2 vpc | tail -n 2 | grep -c vpc) = '0'
+}
diff --git a/tests/test_suite/09_stacker_build-missing_variable.bats b/tests/test_suite/09_stacker_build-missing_variable.bats
new file mode 100644
index 000000000..e8f8a8cd1
--- /dev/null
+++ b/tests/test_suite/09_stacker_build-missing_variable.bats
@@ -0,0 +1,17 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - missing variable" {
+  needs_aws
+
+  stacker build - <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.VPC
+EOF
+  assert ! "$status" -eq 0
+  assert_has_line -E 'MissingVariable: Variable "(PublicSubnets|PrivateSubnets)" in blueprint "vpc" is missing'
+  assert_has_line -E 'vpc: failed \(Variable "(PublicSubnets|PrivateSubnets)" in blueprint "vpc" is missing\)'
+}
diff --git a/tests/test_suite/10_stacker_build-simple_build.bats b/tests/test_suite/10_stacker_build-simple_build.bats
new file mode 100644
index 000000000..2c92ca84d
--- /dev/null
+++ b/tests/test_suite/10_stacker_build-simple_build.bats
@@ -0,0 +1,43 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - simple build" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.VPC
+    stack_policy: tests/fixtures/stack_policies/default.json
+    variables:
+      PublicSubnets: 10.128.0.0/24,10.128.1.0/24,10.128.2.0/24,10.128.3.0/24
+      PrivateSubnets: 10.128.8.0/22,10.128.12.0/22,10.128.16.0/22,10.128.20.0/22
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # Create the new stacks.
+  stacker build <(config)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "vpc: submitted (creating new stack)"
+  assert_has_line "vpc: complete (creating new stack)"
+
+  # Perform a noop update to the stacks, in interactive mode.
+  stacker build -i <(config)
+  assert "$status" -eq 0
+  assert_has_line "Using interactive AWS provider mode"
+  assert_has_line "vpc: skipped (nochange)"
+
+  # Cleanup
+  stacker destroy --force <(config)
+  assert "$status" -eq 0
+  assert_has_line "vpc: submitted (submitted for destruction)"
+  assert_has_line "vpc: complete (stack destroyed)"
+}
diff --git a/tests/test_suite/11_stacker_info-simple_info.bats b/tests/test_suite/11_stacker_info-simple_info.bats
new file mode 100644
index 000000000..ce32305cb
--- /dev/null
+++ b/tests/test_suite/11_stacker_info-simple_info.bats
@@ -0,0 +1,30 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker info - simple info" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # Create the new stacks.
+  stacker build <(config)
+  assert "$status" -eq 0
+
+  stacker info <(config)
+  assert "$status" -eq 0
+  assert_has_line "Outputs for stacks: ${STACKER_NAMESPACE}"
+  assert_has_line "vpc:"
+  assert_has_line "DummyId: dummy-1234"
+}
diff --git a/tests/test_suite/12_stacker_build-simple_build_with_output_lookups.bats b/tests/test_suite/12_stacker_build-simple_build_with_output_lookups.bats
new file mode 100644
index 000000000..b6d22035b
--- /dev/null
+++ b/tests/test_suite/12_stacker_build-simple_build_with_output_lookups.bats
@@ -0,0 +1,34 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - simple build with output lookups" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+  - name: bastion
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    variables:
+      StringVariable: \${output vpc::DummyId}
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # Create the new stacks.
+  stacker build <(config)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+
+  for stack in vpc bastion; do
+    assert_has_line "${stack}: submitted (creating new stack)"
+    assert_has_line "${stack}: complete (creating new stack)"
+  done
+}
diff --git a/tests/test_suite/13_stacker_build-simple_build_with_environment.bats b/tests/test_suite/13_stacker_build-simple_build_with_environment.bats
new file mode 100644
index 000000000..847e586b8
--- /dev/null
+++ b/tests/test_suite/13_stacker_build-simple_build_with_environment.bats
@@ -0,0 +1,35 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - simple build with environment" {
+  needs_aws
+
+  environment() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+vpc_public_subnets: 10.128.0.0/24,10.128.1.0/24,10.128.2.0/24,10.128.3.0/24
+vpc_private_subnets: 10.128.8.0/22,10.128.12.0/22,10.128.16.0/22,10.128.20.0/22
+EOF
+  }
+
+  config() {
+    cat <<EOF
+namespace: \${namespace}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.VPC
+    variables:
+      PublicSubnets: \${vpc_public_subnets}
+      PrivateSubnets: \${vpc_private_subnets
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(environment) <(config)
+  }
+
+  # Create the new stacks.
+  stacker build <(environment) <(config)
+  assert "$status" -eq 0
+}
diff --git a/tests/test_suite/14_stacker_build-interactive_with_skipped_update.bats b/tests/test_suite/14_stacker_build-interactive_with_skipped_update.bats
new file mode 100644
index 000000000..b572b186b
--- /dev/null
+++ b/tests/test_suite/14_stacker_build-interactive_with_skipped_update.bats
@@ -0,0 +1,51 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - interactive with skipped update" {
+  needs_aws
+
+  config1() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+  - name: bastion
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    variables:
+      StringVariable: \${output vpc::DummyId}
+EOF
+  }
+
+  config2() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
+  - name: bastion
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
+    requires: [vpc]
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config1)
+  }
+
+  # Create the new stacks.
+  stacker build <(config1)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "vpc: submitted (creating new stack)"
+  assert_has_line "vpc: complete (creating new stack)"
+  assert_has_line "bastion: submitted (creating new stack)"
+  assert_has_line "bastion: complete (creating new stack)"
+
+  # Attempt an update to all stacks, but skip the vpc update.
+  stacker build -i <(config2) <<< $'n\ny\n'
+  assert "$status" -eq 0
+  assert_has_line "vpc: skipped (canceled execution)"
+  assert_has_line "bastion: submitted (updating existing stack)"
+}
diff --git a/tests/test_suite/15_stacker_build-no_namespace.bats b/tests/test_suite/15_stacker_build-no_namespace.bats
new file mode 100644
index 000000000..4df85c758
--- /dev/null
+++ b/tests/test_suite/15_stacker_build-no_namespace.bats
@@ -0,0 +1,25 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - no namespace" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ""
+stacks:
+  - name: vpc
+    stack_name: ${STACKER_NAMESPACE}-vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # Create the new stacks.
+  stacker build <(config)
+  assert "$status" -eq 0
+}
diff --git a/tests/test_suite/16_stacker_build-overriden_environment_key_with_-e.bats b/tests/test_suite/16_stacker_build-overriden_environment_key_with_-e.bats
new file mode 100644
index 000000000..d24462630
--- /dev/null
+++ b/tests/test_suite/16_stacker_build-overriden_environment_key_with_-e.bats
@@ -0,0 +1,34 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - overriden environment key with -e" {
+  needs_aws
+
+  environment() {
+    cat <<EOF
+namespace: stacker
+EOF
+  }
+
+  config() {
+    cat <<EOF
+namespace: \${namespace}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.VPC
+    variables:
+      PublicSubnets: 10.128.0.0/24,10.128.1.0/24,10.128.2.0/24,10.128.3.0/24
+      PrivateSubnets: 10.128.8.0/22,10.128.12.0/22,10.128.16.0/22,10.128.20.0/22
+EOF
+  }
+
+  teardown() {
+    stacker destroy -e namespace=$STACKER_NAMESPACE --force <(environment) <(config)
+  }
+
+  # Create the new stacks.
+  stacker build -e namespace=$STACKER_NAMESPACE <(environment) <(config)
+  assert "$status" -eq 0
+  assert_has_line "vpc: submitted (creating new stack)"
+}
diff --git a/tests/test_suite/17_stacker_build-dump.bats b/tests/test_suite/17_stacker_build-dump.bats
new file mode 100644
index 000000000..65701f099
--- /dev/null
+++ b/tests/test_suite/17_stacker_build-dump.bats
@@ -0,0 +1,31 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - dump" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+  - name: bastion
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    variables:
+      StringVariable: \${output vpc::DummyId}
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # Create the new stacks.
+  stacker build <(config)
+  assert "$status" -eq 0
+
+  stacker build -d "$TMP" <(config)
+  assert "$status" -eq 0
+}
diff --git a/tests/test_suite/18_stacker_diff-simple_diff_with_output_lookups.bats b/tests/test_suite/18_stacker_diff-simple_diff_with_output_lookups.bats
new file mode 100644
index 000000000..65814a1ee
--- /dev/null
+++ b/tests/test_suite/18_stacker_diff-simple_diff_with_output_lookups.bats
@@ -0,0 +1,46 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker diff - simple diff with output lookups" {
+  needs_aws
+
+  config1() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.DiffTester
+    variables:
+      InstanceType: m3.large
+      WaitConditionCount: 1
+EOF
+  }
+
+  config2() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.DiffTester
+    variables:
+      InstanceType: m3.xlarge
+      WaitConditionCount: 2
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config1)
+  }
+
+  # Create the new stacks.
+  stacker build <(config1)
+  assert "$status" -eq 0
+
+  stacker diff <(config2)
+  assert "$status" -eq 0
+  assert_has_line "\-InstanceType = m3.large"
+  assert_has_line "+InstanceType = m3.xlarge"
+  assert_has_line "+         \"VPC1\": {"
+  assert_has_line "+             \"Type\": \"AWS::CloudFormation::WaitConditionHandle\""
+}
diff --git a/tests/test_suite/19_stacker_build-replacements-only_test_with_additional_resource_no_keyerror.bats b/tests/test_suite/19_stacker_build-replacements-only_test_with_additional_resource_no_keyerror.bats
new file mode 100644
index 000000000..c952d2858
--- /dev/null
+++ b/tests/test_suite/19_stacker_build-replacements-only_test_with_additional_resource_no_keyerror.bats
@@ -0,0 +1,50 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - replacements-only test with additional resource, no keyerror" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: add-resource-test-with-replacements-only
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+
+EOF
+  }
+
+config2() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: add-resource-test-with-replacements-only
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
+
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # Create the new stacks.
+  stacker build <(config)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "add-resource-test-with-replacements-only: submitted (creating new stack)"
+  assert_has_line "add-resource-test-with-replacements-only: complete (creating new stack)"
+
+  # Perform a additional resouce addition in replacements-only mode, should not crash.  This is testing issue #463.
+  stacker build -i --replacements-only <(config2)
+  assert "$status" -eq 0
+  assert_has_line "Using interactive AWS provider mode"
+  assert_has_line "add-resource-test-with-replacements-only: complete (updating existing stack)"
+
+  # Cleanup
+  stacker destroy --force <(config2)
+  assert "$status" -eq 0
+  assert_has_line "add-resource-test-with-replacements-only: submitted (submitted for destruction)"
+  assert_has_line "add-resource-test-with-replacements-only: complete (stack destroyed)"
+}
diff --git a/tests/test_suite/20_stacker_build-locked_stacks.bats b/tests/test_suite/20_stacker_build-locked_stacks.bats
new file mode 100644
index 000000000..7681e0cbe
--- /dev/null
+++ b/tests/test_suite/20_stacker_build-locked_stacks.bats
@@ -0,0 +1,48 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - locked stacks" {
+  needs_aws
+
+  config1() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+EOF
+  }
+
+  config2() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    locked: true
+  - name: bastion
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    variables:
+      StringVariable: \${output vpc::DummyId}
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config2)
+  }
+
+  stacker build <(config2)
+  assert "$status" -eq 1
+  assert_has_line "AttributeError: Stack does not have a defined class or template path."
+
+  # Create the new stacks.
+  stacker build <(config1)
+  assert "$status" -eq 0
+
+  stacker build <(config2)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "vpc: skipped (locked)"
+  assert_has_line "bastion: submitted (creating new stack)"
+  assert_has_line "bastion: complete (creating new stack)"
+}
diff --git a/tests/test_suite/21_stacker_build-default_mode_without_&_with_protected_stack.bats b/tests/test_suite/21_stacker_build-default_mode_without_&_with_protected_stack.bats
new file mode 100644
index 000000000..820843334
--- /dev/null
+++ b/tests/test_suite/21_stacker_build-default_mode_without_&_with_protected_stack.bats
@@ -0,0 +1,61 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - default mode, without & with protected stack" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: mystack
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    protected: ${PROTECTED}
+
+EOF
+  }
+
+  config2() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: mystack
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
+  
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # First create the stack
+  stacker build --interactive <(PROTECTED="false" config)
+  assert "$status" -eq 0
+  assert_has_line "Using interactive AWS provider mode"
+  assert_has_line "mystack: submitted (creating new stack)"
+  assert_has_line "mystack: complete (creating new stack)"
+
+  # Perform a additional resouce addition in interactive mode, non-protected stack
+  stacker build --interactive <(config2) < <(echo "y")
+  assert "$status" -eq 0
+  assert_has_line "Using interactive AWS provider mode"
+  assert_has_line "mystack: submitted (updating existing stack)"
+  assert_has_line "mystack: complete (updating existing stack)"
+  assert_has_line "Add Dummy2"
+
+  # Perform another update, this time without interactive, but with a protected stack
+  stacker build <(PROTECTED="true" config) < <(echo "y")
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "mystack: submitted (updating existing stack)"
+  assert_has_line "mystack: complete (updating existing stack)"
+  assert_has_line "Remove Dummy2"
+
+  # Cleanup
+  stacker destroy --force <(config2)
+  assert "$status" -eq 0
+  assert_has_line "mystack: submitted (submitted for destruction)"
+  assert_has_line "mystack: complete (stack destroyed)"
+}
diff --git a/tests/test_suite/22_stacker_build-recreate_failed_stack_non-interactive_mode.bats b/tests/test_suite/22_stacker_build-recreate_failed_stack_non-interactive_mode.bats
new file mode 100644
index 000000000..46322036e
--- /dev/null
+++ b/tests/test_suite/22_stacker_build-recreate_failed_stack_non-interactive_mode.bats
@@ -0,0 +1,60 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - recreate failed stack, non-interactive mode" {
+  needs_aws
+
+  bad_config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: recreate-failed
+    class_path: stacker.tests.fixtures.mock_blueprints.Broken
+
+EOF
+  }
+
+  good_config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: recreate-failed
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(good_config)
+  }
+
+  stacker destroy --force <(good_config)
+
+  # Create the initial stack. This must fail.
+  stacker build <(bad_config)
+  assert "$status" -eq 1
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "recreate-failed: submitted (creating new stack)"
+  assert_has_line "recreate-failed: failed (rolled back new stack)"
+
+  # Updating the stack should prompt to re-create it.
+  stacker build --recreate-failed <(good_config)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "recreate-failed: submitted (destroying stack for re-creation)"
+  assert_has_line "recreate-failed: submitted (creating new stack)"
+  assert_has_line "recreate-failed: complete (creating new stack)"
+
+  # Confirm the stack is really updated
+  stacker build <(good_config)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "recreate-failed: skipped (nochange)"
+
+  # Cleanup
+  stacker destroy --force <(good_config)
+  assert "$status" -eq 0
+  assert_has_line "recreate-failed: submitted (submitted for destruction)"
+  assert_has_line "recreate-failed: complete (stack destroyed)"
+}
diff --git a/tests/test_suite/23_stacker_build-recreate_failed_stack_interactive_mode.bats b/tests/test_suite/23_stacker_build-recreate_failed_stack_interactive_mode.bats
new file mode 100644
index 000000000..97547fb83
--- /dev/null
+++ b/tests/test_suite/23_stacker_build-recreate_failed_stack_interactive_mode.bats
@@ -0,0 +1,60 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - recreate failed stack, interactive mode" {
+  needs_aws
+
+  bad_config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: recreate-failed-interactive
+    class_path: stacker.tests.fixtures.mock_blueprints.Broken
+
+EOF
+  }
+
+  good_config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: recreate-failed-interactive
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(good_config)
+  }
+
+  stacker destroy --force <(good_config)
+
+  # Create the initial stack. This must fail.
+  stacker build <(bad_config)
+  assert "$status" -eq 1
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "recreate-failed-interactive: submitted (creating new stack)"
+  assert_has_line "recreate-failed-interactive: failed (rolled back new stack)"
+
+  # Updating the stack should prompt to re-create it.
+  stacker build -i <(good_config) <<< $'y\n'
+  assert "$status" -eq 0
+  assert_has_line "Using interactive AWS provider mode"
+  assert_has_line "recreate-failed-interactive: submitted (destroying stack for re-creation)"
+  assert_has_line "recreate-failed-interactive: submitted (creating new stack)"
+  assert_has_line "recreate-failed-interactive: complete (creating new stack)"
+
+  # Confirm the stack is really updated
+  stacker build -i <(good_config)
+  assert "$status" -eq 0
+  assert_has_line "Using interactive AWS provider mode"
+  assert_has_line "recreate-failed-interactive: skipped (nochange)"
+
+  # Cleanup
+  stacker destroy --force <(good_config)
+  assert "$status" -eq 0
+  assert_has_line "recreate-failed-interactive: submitted (submitted for destruction)"
+  assert_has_line "recreate-failed-interactive: complete (stack destroyed)"
+}
diff --git a/tests/test_suite/24_stacker_build-handle_rollbacks_during_updates.bats b/tests/test_suite/24_stacker_build-handle_rollbacks_during_updates.bats
new file mode 100644
index 000000000..1167d836d
--- /dev/null
+++ b/tests/test_suite/24_stacker_build-handle_rollbacks_during_updates.bats
@@ -0,0 +1,64 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - handle rollbacks during updates" {
+  needs_aws
+
+  bad_config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: update-rollback
+    class_path: stacker.tests.fixtures.mock_blueprints.Broken
+
+EOF
+  }
+
+  good_config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: update-rollback
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+
+EOF
+  }
+
+  good_config2() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: update-rollback
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy2
+
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(good_config)
+  }
+
+  stacker destroy --force <(good_config)
+
+  # Create the initial stack
+  stacker build <(good_config)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "update-rollback: submitted (creating new stack)"
+  assert_has_line "update-rollback: complete (creating new stack)"
+
+  # Do a bad update and watch the rollback
+  stacker build <(bad_config)
+  assert "$status" -eq 1
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "update-rollback: submitted (updating existing stack)"
+  assert_has_line "update-rollback: failed (rolled back update)"
+
+  # Do a good update so we know we've correctly waited for rollback
+  stacker build <(good_config2)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "update-rollback: submitted (updating existing stack)"
+  assert_has_line "update-rollback: complete (updating existing stack)"
+}
diff --git a/tests/test_suite/25_stacker_build-handle_rollbacks_in_dependent_stacks.bats b/tests/test_suite/25_stacker_build-handle_rollbacks_in_dependent_stacks.bats
new file mode 100644
index 000000000..a46ed98a3
--- /dev/null
+++ b/tests/test_suite/25_stacker_build-handle_rollbacks_in_dependent_stacks.bats
@@ -0,0 +1,37 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - handle rollbacks in dependent stacks" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: dependent-rollback-parent
+    class_path: stacker.tests.fixtures.mock_blueprints.Broken
+
+  - name: dependent-rollback-child
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    requires: [dependent-rollback-parent]
+
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  stacker destroy --force <(config)
+
+  # Verify both stacks fail during creation
+  stacker build <(config)
+  assert "$status" -eq 1
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "dependent-rollback-parent: submitted (creating new stack)"
+  assert_has_line "dependent-rollback-parent: submitted (rolling back new stack)"
+  assert_has_line "dependent-rollback-parent: failed (rolled back new stack)"
+  assert_has_line "dependent-rollback-child: failed (dependency has failed)"
+  assert_has_line "The following steps failed: dependent-rollback-parent, dependent-rollback-child"
+}
diff --git a/tests/test_suite/26_stacker_build-raw_template.bats b/tests/test_suite/26_stacker_build-raw_template.bats
new file mode 100644
index 000000000..4bbeb0e5a
--- /dev/null
+++ b/tests/test_suite/26_stacker_build-raw_template.bats
@@ -0,0 +1,41 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - raw template" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    template_path: ../stacker/tests/fixtures/cfn_template.json
+    variables:
+      Param1: foobar
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # Create the new stacks.
+  stacker build <(config)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "vpc: submitted (creating new stack)"
+  assert_has_line "vpc: complete (creating new stack)"
+
+  # Perform a noop update to the stacks, in interactive mode.
+  stacker build -i <(config)
+  assert "$status" -eq 0
+  assert_has_line "Using interactive AWS provider mode"
+  assert_has_line "vpc: skipped (nochange)"
+
+  # Cleanup
+  stacker destroy --force <(config)
+  assert "$status" -eq 0
+  assert_has_line "vpc: submitted (submitted for destruction)"
+  assert_has_line "vpc: complete (stack destroyed)"
+}
diff --git a/tests/test_suite/27_stacker_diff-raw_template.bats b/tests/test_suite/27_stacker_diff-raw_template.bats
new file mode 100644
index 000000000..0d61bf19a
--- /dev/null
+++ b/tests/test_suite/27_stacker_diff-raw_template.bats
@@ -0,0 +1,42 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker diff - raw template" {
+  needs_aws
+
+  config1() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    template_path: ../stacker/tests/fixtures/cfn_template.json
+    variables:
+      Param1: foobar
+EOF
+  }
+
+  config2() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    template_path: ../stacker/tests/fixtures/cfn_template.json
+    variables:
+      Param1: newbar
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config1)
+  }
+
+  # Create the new stacks.
+  stacker build <(config1)
+  assert "$status" -eq 0
+
+  stacker diff <(config2)
+  assert "$status" -eq 0
+  assert_has_line "\-Param1 = foobar"
+  assert_has_line "+Param1 = newbar"
+}
diff --git a/tests/test_suite/29_stacker_build-no_parallelism.bats b/tests/test_suite/29_stacker_build-no_parallelism.bats
new file mode 100644
index 000000000..c12d12a40
--- /dev/null
+++ b/tests/test_suite/29_stacker_build-no_parallelism.bats
@@ -0,0 +1,30 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - no parallelism" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc1
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+  - name: vpc2
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # Create the new stacks.
+  stacker build -j 1 <(config)
+  assert "$status" -eq 0
+  assert_has_line "vpc1: submitted (creating new stack)"
+  assert_has_line "vpc1: complete (creating new stack)"
+  assert_has_line "vpc2: submitted (creating new stack)"
+  assert_has_line "vpc2: complete (creating new stack)"
+}
diff --git a/tests/test_suite/30_stacker_build-tailing.bats b/tests/test_suite/30_stacker_build-tailing.bats
new file mode 100644
index 000000000..a2e9da3e5
--- /dev/null
+++ b/tests/test_suite/30_stacker_build-tailing.bats
@@ -0,0 +1,37 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - tailing" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+  - name: bastion
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    requires: [vpc]
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # Create the new stacks.
+  stacker build --tail <(config)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "Tailing stack: ${STACKER_NAMESPACE}-vpc"
+  assert_has_line "vpc: submitted (creating new stack)"
+  assert_has_line "vpc: complete (creating new stack)"
+  assert_has_line "Tailing stack: ${STACKER_NAMESPACE}-bastion"
+  assert_has_line "bastion: submitted (creating new stack)"
+  assert_has_line "bastion: complete (creating new stack)"
+
+  stacker destroy --force --tail <(config)
+  assert "$status" -eq 0
+}
diff --git a/tests/test_suite/31_stacker_build-override_stack_name.bats b/tests/test_suite/31_stacker_build-override_stack_name.bats
new file mode 100644
index 000000000..26872477a
--- /dev/null
+++ b/tests/test_suite/31_stacker_build-override_stack_name.bats
@@ -0,0 +1,34 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - override stack name" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    stack_name: vpcx
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+  - name: bastion
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    variables:
+      StringVariable: \${output vpc::DummyId}
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # Create the new stacks.
+  stacker build <(config)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "vpc: submitted (creating new stack)"
+  assert_has_line "vpc: complete (creating new stack)"
+  assert_has_line "bastion: submitted (creating new stack)"
+  assert_has_line "bastion: complete (creating new stack)"
+}
diff --git a/tests/test_suite/32_stacker_build-multi_region.bats b/tests/test_suite/32_stacker_build-multi_region.bats
new file mode 100644
index 000000000..b31196ffe
--- /dev/null
+++ b/tests/test_suite/32_stacker_build-multi_region.bats
@@ -0,0 +1,55 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - multi region" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: west/vpc
+    region: us-west-1
+    stack_name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+  - name: east/vpc
+    region: us-east-1
+    stack_name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+  - name: app
+    region: us-east-1
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+    variables:
+      StringVariable: \${output west/vpc::DummyId}
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # Create the new stacks.
+  stacker build <(config)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "vpc: submitted (creating new stack)"
+  assert_has_line "vpc: complete (creating new stack)"
+  assert_has_line "app: submitted (creating new stack)"
+  assert_has_line "app: complete (creating new stack)"
+
+  config_simple() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: west/vpc
+    region: us-west-1
+    stack_name: vpc
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+EOF
+  }
+
+  # Assert that the vpc stack was built in us-west-1
+  stacker info <(config_simple)
+  assert_has_line "Region: us-west-1"
+}
diff --git a/tests/test_suite/33_stacker_build-profiles.bats b/tests/test_suite/33_stacker_build-profiles.bats
new file mode 100644
index 000000000..64e42398b
--- /dev/null
+++ b/tests/test_suite/33_stacker_build-profiles.bats
@@ -0,0 +1,28 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+
+@test "stacker build - profiles" {
+  needs_aws
+
+  config() {
+    cat <<EOF
+namespace: ${STACKER_NAMESPACE}
+stacks:
+  - name: vpc
+    profile: stacker
+    class_path: stacker.tests.fixtures.mock_blueprints.Dummy
+EOF
+  }
+
+  teardown() {
+    stacker destroy --force <(config)
+  }
+
+  # Create the new stacks.
+  stacker build <(config)
+  assert "$status" -eq 0
+  assert_has_line "Using default AWS provider mode"
+  assert_has_line "vpc: submitted (creating new stack)"
+  assert_has_line "vpc: complete (creating new stack)"
+}