diff --git a/.travis.yml b/.travis.yml
index 35b4955..be00cc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,24 +5,31 @@ matrix:
   include:
     - os: linux
       dist: trusty
-    - os: osx
   fast_finish: true
 
 env:
   global:
     - CC_ENV=travis-ci
+    - CC_PASSWORD=manage123
 
-  # matrix:
-  #   - CC_BOOT=default
+services:
+  - docker
 
 before_install:
-  - antcc/bootstrap/install.sh
-  - . $HOME/.bash_profile
+  - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
 
 script:
+  - docker-compose run --rm init
+  - docker-compose down
+  - docker-compose up -d cc
+  - docker-compose run --rm init ant waitcc test -Dbuild.dir=/tmp/build
+  - docker-compose down
+
+  - antcc/bootstrap/install.sh
+  - . $HOME/.bash_profile	  
   - antcc boot -Daccept.license=true
-  - antcc up test
+  - antcc up test stopcc
 
 cache:
-  directories:
+  directories:	
     - $HOME/Downloads
diff --git a/antcc b/antcc
index 83e7a62..af7e06b 160000
--- a/antcc
+++ b/antcc
@@ -1 +1 @@
-Subproject commit 83e7a621584eeb8299eebe2febefe4b0d758bb9f
+Subproject commit af7e06b53d727028bce72c2cf2f94e984f651a5d
diff --git a/docker-compose.yml b/docker-compose.yml
index db8dfae..4dce810 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,6 @@ services:
       - EMPOWER_USR
       - EMPOWER_PSW
       - CC_PASSWORD
-    command: ant up test clean
+    command: ant up test clean -Dbuild.dir=/tmp/build
     depends_on:
       - cc
diff --git a/tests/test-masters.xml b/tests/test-masters.xml
index 64e04c7..52b3cac 100644
--- a/tests/test-masters.xml
+++ b/tests/test-masters.xml
@@ -5,20 +5,20 @@
 
 	<target name="test-repos-master-prods" depends="sagenvInit" description="Verify SAG product repositories">
 		<property file="${env.properties}"/>
-		<cc command="list repository products" expectedvalues="${release}" format="csv" output="build/logs/product-repos.csv" wait="5" />
+		<cc command="list repository products" expectedvalues="${release}" format="csv" output="${build.dir}/logs/product-repos.csv" wait="5" />
 	</target>
 
 	<!-- <target name="test-repos-master-prods-listing" depends="sagenvInit" description="Verify SAG product repository listing">
 		<property file="${env.properties}"/>
-		<cc command="list repository products content webMethods-${release}" expectedvalues="SPM" format="csv" output="build/logs/products.csv" wait="240" />
+		<cc command="list repository products content webMethods-${release}" expectedvalues="SPM" format="csv" output="${build.dir}/logs/products.csv" wait="240" />
 	</target> -->
 
 	<target name="test-repos-master-fixes" depends="sagenvInit" description="Verify SAG fix repositories">
-		<cc command="list repository fixes" expectedvalues="Empower" format="csv" output="build/logs/fix-repos.csv" wait="5" />
+		<cc command="list repository fixes" expectedvalues="Empower" format="csv" output="${build.dir}/logs/fix-repos.csv" wait="5" />
 	</target>
 
 	<target name="test-repos-master-fixes-listing" depends="sagenvInit" description="Verify SAG fix repository listing">
-		<cc command="list repository fixes content Empower" expectedvalues="SPM" format="csv" output="build/logs/fixes.csv" />
+		<cc command="list repository fixes content Empower" expectedvalues="SPM" format="csv" output="${build.dir}/logs/fixes.csv" />
 	</target>
 	
 </project>