diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 95bd0836..4ff485d8 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.shadowsocks"
-    android:versionCode="93"
-    android:versionName="2.5.4">
+    android:versionCode="95"
+    android:versionName="2.5.5">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala
index e3c461a4..1cf8b925 100644
--- a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala
+++ b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala
@@ -123,6 +123,8 @@ object ConfigUtils {
       |server {
       | label = "local-server";
       | ip = 127.0.0.1;
+      | uptest = none;
+      | preset = on;
       | port = %d;
       | timeout = 5;
       |}
@@ -159,9 +161,8 @@ object ConfigUtils {
       | reject = %s;
       | reject_policy = fail;
       | reject_recursively = on;
-      | uptest = query;
-      | query_test_name = ".";
-      |	interval = ontimeout;
+      | uptest = none;
+      | preset = on;
       |}
       |
       |server {
@@ -172,9 +173,8 @@ object ConfigUtils {
       | reject = %s;
       | reject_policy = fail;
       | reject_recursively = on;
-      |	uptest = query;
-      |	query_test_name = ".";
-      |	interval = ontimeout;
+      | uptest = none;
+      | preset = on;
       |}
       |
       |server {