diff --git a/tests.mk b/tests.mk
index 0bab93efb..755e26399 100644
--- a/tests.mk
+++ b/tests.mk
@@ -63,6 +63,10 @@ unit-tests:
 	@echo running unit tests...
 	@$(QUIET) bats tests/unit
 
+deploy-test-clojure:
+	@echo deploying config app...
+	cd tests && ./test_deploy ./apps/clojure dokku.me
+
 deploy-test-config:
 	@echo deploying config app...
 	cd tests && ./test_deploy ./apps/config dokku.me
@@ -111,6 +115,7 @@ deploy-tests:
 	@echo running deploy tests...
 	# @$(QUIET) bats tests/deploy
 	@$(QUIET) $(MAKE) deploy-test-config
+	@$(QUIET) $(MAKE) deploy-test-clojure
 	@$(QUIET) $(MAKE) deploy-test-gitsubmodules
 	@$(QUIET) $(MAKE) deploy-test-go
 	@$(QUIET) $(MAKE) deploy-test-java
diff --git a/tests/apps/clojure/Procfile b/tests/apps/clojure/Procfile
new file mode 100644
index 000000000..09a6c193f
--- /dev/null
+++ b/tests/apps/clojure/Procfile
@@ -0,0 +1 @@
+web: lein run
diff --git a/tests/apps/clojure/README.md b/tests/apps/clojure/README.md
new file mode 100644
index 000000000..980535d00
--- /dev/null
+++ b/tests/apps/clojure/README.md
@@ -0,0 +1,4 @@
+Hello Clojure/Compojure
+=======================
+
+A minimal Hello World web app in [Clojure](http://clojure.org/), using the [Compojure](https://github.com/weavejester/compojure) web framework.
diff --git a/tests/apps/clojure/check_deploy b/tests/apps/clojure/check_deploy
new file mode 100755
index 000000000..c48bc573b
--- /dev/null
+++ b/tests/apps/clojure/check_deploy
@@ -0,0 +1 @@
+set -e; sleep 5; output="$(curl -s -S $1)"; echo $output; test "$output" == "Hello World!"
diff --git a/tests/apps/clojure/project.clj b/tests/apps/clojure/project.clj
new file mode 100644
index 000000000..a9789f8d2
--- /dev/null
+++ b/tests/apps/clojure/project.clj
@@ -0,0 +1,7 @@
+(defproject clojure-sample "1.0.1"
+  :description "Hello World Clojure Web App"
+  :dependencies [[org.clojure/clojure "1.6.0"]
+                 [compojure "1.3.1"]
+                 [ring/ring-jetty-adapter "1.3.2"]]
+  :main ^:skip-aot sample.app
+  :min-lein-version "2.0.0")
diff --git a/tests/apps/clojure/src/sample/app.clj b/tests/apps/clojure/src/sample/app.clj
new file mode 100644
index 000000000..4567ce96e
--- /dev/null
+++ b/tests/apps/clojure/src/sample/app.clj
@@ -0,0 +1,13 @@
+(ns sample.app
+  (:require [ring.adapter.jetty :as jetty]
+            [compojure.core :refer [defroutes GET]]))
+
+(defroutes handler
+  (GET "/" []
+       {:headers {"Content-type" "text/plain; charset=UTF-8"}
+        :body "Hello World!"}))
+
+(defn -main []
+  (jetty/run-jetty handler
+                   {:port (Integer. (or (System/getenv "PORT") "5000"))
+                    :join? false}))