diff --git a/circle.yml b/circle.yml
index 246276f8e..15e0d8fcc 100644
--- a/circle.yml
+++ b/circle.yml
@@ -11,7 +11,7 @@ dependencies:
     - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B
 test:
   override:
-    - mvn test -T2C
+    - ./scripts/run_circle_tests.sh
 deployment:
   snapshot:
     branch: vgs-edition
@@ -22,10 +22,12 @@ deployment:
       tag: /.*/
       commands:
         - git config user.name "circleci"
+        - git config user.email "circleci@vgs.com"
         - git fetch
         - git checkout $RELEASE_BRANCH
         - git pull origin $RELEASE_BRANCH
         - git reset --hard
         - git tag -d $CIRCLE_TAG
-        - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests
+        - mvn -B -X -e gitflow:release-start -DreleaseVersion=$CIRCLE_TAG
+        - mvn -B -X -e gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals='deploy -DskipTests'
         - git push origin $RELEASE_BRANCH
diff --git a/pom.xml b/pom.xml
index b53e0645e..c50945867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>org.littleshoot</groupId>
     <artifactId>littleproxy</artifactId>
     <packaging>jar</packaging>
-    <version>1.1.5.0-VGS</version>
+    <version>1.1.5.0-VGS-SNAPSHOT</version>
     <name>LittleProxy</name>
     <description>
         LittleProxy is a high performance HTTP proxy written in Java and using the Netty networking framework.
diff --git a/scripts/run_circle_tests.sh b/scripts/run_circle_tests.sh
new file mode 100755
index 000000000..21245dc4b
--- /dev/null
+++ b/scripts/run_circle_tests.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+if [ "$CIRCLE_TAG" == "" ]
+then
+  mvn test -T2C
+fi
\ No newline at end of file