diff --git a/Makefile b/Makefile
index 53f34cb..4bedafb 100644
--- a/Makefile
+++ b/Makefile
@@ -38,10 +38,10 @@ clean:
 	rm -f tests/*.pyc
 
 run-es-single: pull-latest-baseimage
-	ES_NODE_COUNT=1 docker-compose up --build elasticsearch1
+	ES_NODE_COUNT=1 docker-compose -f docker-compose.yml -f docker-compose.hostports.yml up --build elasticsearch1
 
 run-es-cluster: pull-latest-baseimage
-	ES_NODE_COUNT=2 docker-compose up --build elasticsearch1 elasticsearch2
+	ES_NODE_COUNT=2 docker-compose -f docker-compose.yml -f docker-compose.hostports.yml up --build elasticsearch1 elasticsearch2
 
 single-node-test: export ES_NODE_COUNT=1
 single-node-test: pull-latest-baseimage clean
diff --git a/docker-compose.hostports.yml b/docker-compose.hostports.yml
new file mode 100644
index 0000000..5aaf2b8
--- /dev/null
+++ b/docker-compose.hostports.yml
@@ -0,0 +1,7 @@
+# Override docker-compose ports to expose 9200 on localhost for run-* targets
+---
+version: '2'
+services:
+  elasticsearch1:
+    ports:
+      - 9200:9200
diff --git a/docker-compose.yml b/docker-compose.yml
index d788fff..9f4b902 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,9 +17,6 @@ services:
       - discovery.zen.minimum_master_nodes=${ES_NODE_COUNT}
     image: "elasticsearch:${IMAGETAG}"
     mem_limit: 4g
-    ports:
-      - 9200:9200
-      - 9300
     ulimits:
       memlock:
         soft: -1
@@ -45,9 +42,6 @@ services:
     links:
       - elasticsearch1
     mem_limit: 4g
-    ports:
-      - 9200
-      - 9300
     ulimits:
       memlock:
         soft: -1