diff --git a/Makefile b/Makefile
index 9a9f22ab4..ff8a45111 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,33 @@
 # Just builds
+
+DIR := ${CURDIR}
+
 dep:
-	@ glide install --strip-vendor
+	glide install --strip-vendor
 
 build:
-	@ go build -o functions
+	go build -o functions
 
 build-docker:
-	sh scripts/build-docker.sh
-
-release:
-	sh scripts/release.sh
+	set -ex
+	docker run --rm -v $(DIR):/go/src/github.com/iron-io/functions -w /go/src/github.com/iron-io/functions iron/go:dev go build -o functions-alpine
+	docker build -t iron/functions:latest .
 
 test:
-	sh scripts/test.sh
+	go test -v $(shell glide nv | grep -v examples | grep -v tool)
 
-run-docker:
-	sh scripts/run-docker.sh
+test-docker:
+	docker run -ti --privileged --rm -e LOG_LEVEL=debug \
+	-v /var/run/docker.sock:/var/run/docker.sock \
+	-v $(DIR):/go/src/github.com/iron-io/functions \
+	-w /go/src/github.com/iron-io/functions iron/go:dev go test \
+	-v $(shell glide nv | grep -v examples | grep -v tool)
 
-run-simple:
+run:
 	./functions
 
+run-docker: build-docker
+	set -ex
+	docker run --rm --privileged -it -e LOG_LEVEL=debug -e "DB=bolt:///app/data/bolt.db" -v $(DIR)/data:/app/data -p 8080:8080 iron/functions
+
 all: dep build
\ No newline at end of file
diff --git a/circle.yml b/circle.yml
index 0cd954648..286419dd2 100644
--- a/circle.yml
+++ b/circle.yml
@@ -29,5 +29,5 @@ dependencies:
 
 test:
   override:
-    - scripts/test.sh:
+    - make test-docker:
         pwd: $GO_PROJECT
diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
deleted file mode 100755
index 08143fa31..000000000
--- a/scripts/build-docker.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-set -ex
-
-docker run --rm -v "$PWD":/go/src/github.com/iron-io/functions -w /go/src/github.com/iron-io/functions iron/go:dev go build -o functions-alpine
-docker build -t iron/functions:latest .
diff --git a/scripts/release.sh b/scripts/release.sh
deleted file mode 100755
index a34648f60..000000000
--- a/scripts/release.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-set -ex
-
-user="iron"
-service="functions"
-version_file="api/server/version.go"
-tag="latest"
-
-if [ -z $(grep -m1 -Eo "[0-9]+\.[0-9]+\.[0-9]+" $version_file) ]; then
-  echo "did not find semantic version in $version_file"
-  exit 1
-fi
-
-perl -i -pe 's/\d+\.\d+\.\K(\d+)/$1+1/e' $version_file
-version=$(grep -m1 -Eo "[0-9]+\.[0-9]+\.[0-9]+" $version_file)
-echo "Version: $version"
-
-./scripts/build-docker.sh
-
-git add -u
-git commit -m "$service: $version release"
-git tag -a "$version" -m "version $version"
-git push
-git push --tags
-
-# Finally tag and push docker images
-docker tag $user/$service:$tag $user/$service:$version
-
-docker push $user/$service:$version
-docker push $user/$service:$tag
diff --git a/scripts/run-docker.sh b/scripts/run-docker.sh
deleted file mode 100755
index f78d06eba..000000000
--- a/scripts/run-docker.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-set -ex
-
-sh ./scripts/build-docker.sh
-
-docker run --rm --privileged -it -e LOG_LEVEL=debug -e "DB=bolt:///app/data/bolt.db" -v $PWD/data:/app/data -p 8080:8080 iron/functions
diff --git a/scripts/test.sh b/scripts/test.sh
deleted file mode 100755
index edb59eeab..000000000
--- a/scripts/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker run -ti --privileged --rm -e GIN_MODE=$GIN_MODE -e LOG_LEVEL=debug -v /var/run/docker.sock:/var/run/docker.sock -v "$PWD":/go/src/github.com/iron-io/functions -w /go/src/github.com/iron-io/functions iron/go:dev go test -v $(glide nv | grep -v examples | grep -v tool)
\ No newline at end of file
diff --git a/test/Dockerfile b/tests/Dockerfile
similarity index 100%
rename from test/Dockerfile
rename to tests/Dockerfile
diff --git a/test/Gemfile b/tests/Gemfile
similarity index 100%
rename from test/Gemfile
rename to tests/Gemfile
diff --git a/test/Gemfile.lock b/tests/Gemfile.lock
similarity index 100%
rename from test/Gemfile.lock
rename to tests/Gemfile.lock
diff --git a/test/README.md b/tests/README.md
similarity index 100%
rename from test/README.md
rename to tests/README.md
diff --git a/test/build.sh b/tests/build.sh
similarity index 100%
rename from test/build.sh
rename to tests/build.sh
diff --git a/test/run.sh b/tests/run.sh
similarity index 100%
rename from test/run.sh
rename to tests/run.sh
diff --git a/test/test.rb b/tests/test.rb
similarity index 100%
rename from test/test.rb
rename to tests/test.rb
diff --git a/test/utils.rb b/tests/utils.rb
similarity index 100%
rename from test/utils.rb
rename to tests/utils.rb