diff --git a/.travis.yml b/.travis.yml
index f20578c12..7aece9590 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,12 +20,13 @@ before_install:
   - ls -l /usr/lib/jvm
   - echo "JAVA_HOME=$JAVA_HOME"
   - echo "PATH=$PATH"
-  - mvn --version
+  - ./mvnw --version
 
   - pip install --user codecov
 
 script:
-  - mvn test -B
+  - ./mvnw clean install --batch-mode
+  - echo "Run Agent test"
   - ./run-agent-test.sh skip
 
 after_success:
diff --git a/appveyor.yml b/appveyor.yml
index 772e1483b..380f5fb28 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,7 +4,7 @@ build: off
 clone_depth: 5
 branches:
   except:
-    - travis-ci
+    - travis-ci.*
 
 environment:
   matrix:
@@ -20,33 +20,25 @@ init:
   - ps: "ls 'C:/Program Files (x86)/Java/jdk*'"
 
 install:
-  - ps: |
-      Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\maven\apache-maven-3.2.5")) {
-        (new-object System.Net.WebClient).DownloadFile(
-          'http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip',
-          'C:\maven-bin.zip'
-        )
-        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
-      }
   - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH%
   - cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
   - cmd: SET MAVEN_OPTS=-Xmx768m -XX:MaxPermSize=128m
   - cmd: SET JAVA_OPTS=-Xmx768m -XX:MaxPermSize=128m
   - "ECHO JAVA_HOME=%JAVA_HOME%, HOMEPATH=%HOMEPATH%, PATH=%PATH%"
-  - cmd: mvn --version
+  - cmd: ./mvnw.cmd --version
 
 test_script:
-  - mvn clean install --batch-mode
-  - mvn dependency:copy-dependencies -DincludeScope=test
+  - ./mvnw.cmd clean install --batch-mode
+  - ./mvnw.cmd dependency:copy-dependencies -DincludeScope=test
   - rm target/dependency/javassist*
+  - echo "Run Agent test"
   - ps: |
       $ttl_jar=Get-ChildItem target\transmittable-thread-local-*.jar -Exclude *-sources.jar | Select-Object -ExpandProperty FullName
       $cp=Get-ChildItem target\dependency\*.jar | Select-Object -ExpandProperty FullName
       $cp=$cp + 'target\test-classes'
       $cp=$cp -join ';'
       echo "java -Xmx256m -Xms256m -Xbootclasspath/a:$ttl_jar -javaagent:$ttl_jar -cp $cp -ea com.alibaba.ttl.threadpool.agent.AgentCheck"
-      $output = java -Xmx256m -Xms256m -Xbootclasspath/a:$ttl_jar -javaagent:$ttl_jar -cp $cp -ea com.alibaba.ttl.threadpool.agent.AgentCheck 2>&1
+      $output=java -Xmx256m -Xms256m -Xbootclasspath/a:$ttl_jar -javaagent:$ttl_jar -cp $cp -ea com.alibaba.ttl.threadpool.agent.AgentCheck 2>&1
       $output.CategoryInfo.TargetName | Out-Default
 
 cache: