diff --git a/builtin/providers/openstack/devstack/deploy.sh b/builtin/providers/openstack/devstack/deploy.sh
new file mode 100644
index 000000000..2225478e1
--- /dev/null
+++ b/builtin/providers/openstack/devstack/deploy.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+sudo apt-get update
+sudo apt-get install -y git make mercurial
+
+GOPKG=go1.5.2.linux-amd64.tar.gz
+wget https://storage.googleapis.com/golang/$GOPKG
+sudo tar -xvf $GOPKG -C /usr/local/
+
+mkdir ~/go
+echo 'export GOPATH=$HOME/go' >> .bashrc
+echo 'export PATH=$PATH:/usr/local/go/bin:$GOPATH/bin' >> .bashrc
+source .bashrc
+export GOPATH=$HOME/go
+export PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
+
+go get github.com/hashicorp/terraform
+cd $GOPATH/src/github.com/hashicorp/terraform
+make updatedeps
+
+cd
+git clone https://git.openstack.org/openstack-dev/devstack -b stable/liberty
+cd devstack
+cat >local.conf <<EOF
+[[local|localrc]]
+# OpenStack version
+OPENSTACK_VERSION="liberty"
+
+# devstack password
+DEVSTACK_PASSWORD="password"
+
+# Configure passwords and the Swift Hash
+MYSQL_PASSWORD=\$DEVSTACK_PASSWORD
+RABBIT_PASSWORD=\$DEVSTACK_PASSWORD
+SERVICE_TOKEN=\$DEVSTACK_PASSWORD
+ADMIN_PASSWORD=\$DEVSTACK_PASSWORD
+SERVICE_PASSWORD=\$DEVSTACK_PASSWORD
+SWIFT_HASH=\$DEVSTACK_PASSWORD
+
+# Configure the stable OpenStack branches used by DevStack
+# For stable branches see
+# http://git.openstack.org/cgit/openstack-dev/devstack/refs/
+CINDER_BRANCH=stable/\$OPENSTACK_VERSION
+CEILOMETER_BRANCH=stable/\$OPENSTACK_VERSION
+GLANCE_BRANCH=stable/\$OPENSTACK_VERSION
+HEAT_BRANCH=stable/\$OPENSTACK_VERSION
+HORIZON_BRANCH=stable/\$OPENSTACK_VERSION
+KEYSTONE_BRANCH=stable/\$OPENSTACK_VERSION
+NEUTRON_BRANCH=stable/\$OPENSTACK_VERSION
+NOVA_BRANCH=stable/\$OPENSTACK_VERSION
+SWIFT_BRANCH=stable/\$OPENSTACK_VERSION
+ZAQAR_BRANCH=stable/\$OPENSTACK_VERSION
+
+# Enable Swift
+enable_service s-proxy
+enable_service s-object
+enable_service s-container
+enable_service s-account
+
+# Disable Nova Network and enable Neutron
+disable_service n-net
+enable_service q-svc
+enable_service q-agt
+enable_service q-dhcp
+enable_service q-l3
+enable_service q-meta
+enable_service q-metering
+enable_service q-lbaas
+enable_service q-fwaas
+
+# Disable Tempest
+disable_service tempest
+
+# Disable Horizon
+disable_service horizon
+
+# Enable Ceilometer
+#enable_service ceilometer-acompute
+#enable_service ceilometer-acentral
+#enable_service ceilometer-anotification
+#enable_service ceilometer-collector
+#enable_service ceilometer-alarm-evaluator
+#enable_service ceilometer-alarm-notifier
+#enable_service ceilometer-api
+
+# Enable Zaqar
+#enable_plugin zaqar https://github.com/openstack/zaqar
+#enable_service zaqar-server
+
+# Automatically download and register a VM image that Heat can launch
+# For more information on Heat and DevStack see
+# http://docs.openstack.org/developer/heat/getting_started/on_devstack.html
+#IMAGE_URLS+=",http://cloud.fedoraproject.org/fedora-20.x86_64.qcow2"
+
+# Logging
+LOGDAYS=1
+LOGFILE=/opt/stack/logs/stack.sh.log
+LOGDIR=/opt/stack/logs
+EOF
+./stack.sh
+
+# Prep the testing environment by creating the required testing resources and environment variables
+source openrc admin
+wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img
+glance image-create --name CirrOS --disk-format qcow2 --container-format bare < cirros-0.3.4-x86_64-disk.img
+nova flavor-create m1.tform 99 512 5 1 --ephemeral 10
+_NETWORK_ID=$(nova net-list | grep private | awk -F\| '{print $2}' | tr -d ' ')
+_IMAGE_ID=$(nova image-list | grep CirrOS | awk -F\| '{print $2}' | tr -d ' ' | head -1)
+echo export OS_IMAGE_NAME="cirros-0.3.4-x86_64-uec" >> openrc
+echo export OS_IMAGE_ID="$_IMAGE_ID" >> openrc
+echo export OS_NETWORK_ID=$_NETWORK_ID >> openrc
+echo export OS_POOL_NAME="public" >> openrc
+echo export OS_FLAVOR_ID=99 >> openrc
+source openrc demo
+
+cd $GOPATH/src/github.com/hashicorp/terraform
+make updatedeps
+
+# Replace the below lines with the repo/branch you want to test
+#git remote add jtopjian https://github.com/jtopjian/terraform
+#git fetch jtopjian
+#git checkout --track jtopjian/openstack-acctest-fixes
+#make testacc TEST=./builtin/providers/openstack TESTARGS='-run=AccBlockStorageV1'
+#make testacc TEST=./builtin/providers/openstack TESTARGS='-run=AccCompute'
+#make testacc TEST=./builtin/providers/openstack
diff --git a/website/source/docs/providers/openstack/index.html.markdown b/website/source/docs/providers/openstack/index.html.markdown
index be918a465..e24857193 100644
--- a/website/source/docs/providers/openstack/index.html.markdown
+++ b/website/source/docs/providers/openstack/index.html.markdown
@@ -64,7 +64,7 @@ The following arguments are supported:
     service catalog. It can be set using the OS_ENDPOINT_TYPE environment
     variable. If not set, public endpoints is used.
 
-## Testing
+## Testing and Development
 
 In order to run the Acceptance Tests for development, the following environment
 variables must also be set:
@@ -79,3 +79,15 @@ variables must also be set:
 * `OS_POOL_NAME` - The name of a Floating IP pool.
 
 * `OS_NETWORK_ID` - The UUID of a network in your test environment.
+
+To make development easier, the `builtin/providers/openstack/devstack/deploy.sh`
+script will assist in installing and configuring a standardized
+[DevStack](http://docs.openstack.org/developer/devstack/) environment along with
+Golang, Terraform, and all development dependencies. It will also set the required
+environment variables in the `devstack/openrc` file.
+
+Do not run the `deploy.sh` script on your workstation or any type of production
+server. Instead, run the script within a disposable virtual machine.
+[Here's](https://github.com/berendt/terraform-configurations) an example of a
+Terraform configuration that will create an OpenStack instance and then install and
+configure DevStack inside.