diff --git a/.travis.yml b/.travis.yml
index f96eea0b..3fc4a307 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ before_install:
 - curl -3L https://raw.github.com/embarkmobile/android-sdk-installer/version-1/android-sdk-installer
   | bash /dev/stdin --install=$COMPONENTS
 - source ~/.android-sdk-installer/env
-- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 20M
+- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
 - emulator -avd test -no-skin -no-audio -no-window &
 - rm pom.xml
 - android update project -p .
@@ -17,7 +17,7 @@ script:
 - ant clean
 - ant debug
 - cd test_client/tests
-- ant clean debug install test
+- ant acceptance-test
 env:
   global:
   - secure: f4Kms/mzkYRG4Kp8k6hsvG3Y0ztbJnA2J79OBw3VdqJOKVTzwsxMd1Yh325YDYO7I4HeHxGXy0H4p3rAPzIWr/nrOJ4wmcDwQYDQtVjF7S1ARWsX51FrCEV6A9ec2LAqNCQ8ZC0SoGb+HsmpFCE3uKAxRQt+B5MzOZvKNcvYpMA=
diff --git a/test_client/tests/custom_rules.xml b/test_client/tests/custom_rules.xml
new file mode 100644
index 00000000..c771dcd6
--- /dev/null
+++ b/test_client/tests/custom_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="custom_rules">
+	<!-- Run regular Android target 'test', but fails if any test is not successful -->
+	<target name="acceptance-test" depends="clean, debug, install" >
+		<property name="log.file" value="tests_output.txt" />
+		<record name="${log.file}" action="start" />
+		<antcall target="test" />	<!-- regular Android target --> 
+		<record name="${log.file}" action="stop" />
+		<loadfile property="tests.output" srcFile="${log.file}" />
+		<echo>Checking for failures</echo>
+		<fail message="Acceptance tests failed." >
+			<condition>
+				<contains string="${tests.output}" substring="FAILURES" />
+			</condition>
+		</fail>
+		<echo>All tests passed.</echo>
+	</target>
+	
+</project>
\ No newline at end of file