diff --git a/android/proguard-android-optimize.txt b/android/proguard.cfg
similarity index 100%
rename from android/proguard-android-optimize.txt
rename to android/proguard.cfg
diff --git a/androidtest/proguard.cfg b/androidtest/proguard.cfg
index d39be4ad2..7a324d9ce 100644
--- a/androidtest/proguard.cfg
+++ b/androidtest/proguard.cfg
@@ -10,7 +10,7 @@
 # be complete or up to date. (The "arithmetic" optimization can be
 # used if you are only targeting Android 2.0 or later.)  Make sure you
 # test thoroughly if you go this route.
--optimizations !code/simplification/cast,!field/*,!class/merging/*
+-optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable
 -optimizationpasses 5
 -allowaccessmodification
 -dontpreverify
@@ -23,6 +23,9 @@
 -dontskipnonpubliclibraryclasses
 -verbose
 
+# ADDED
+-dontobfuscate
+
 -keepattributes *Annotation*
 -keep public class com.google.vending.licensing.ILicensingService
 -keep public class com.android.vending.licensing.ILicensingService
diff --git a/androidtest/project.properties b/androidtest/project.properties
index 417102c4c..ff8fa0636 100644
--- a/androidtest/project.properties
+++ b/androidtest/project.properties
@@ -3,10 +3,12 @@
 #
 # This file must be checked in Version Control Systems.
 #
-# To customize properties used by the Ant build system use,
+# To customize properties used by the Ant build system edit
 # "ant.properties", and override values to adapt the script to your
 # project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+proguard.config=proguard-android-optimize.txt
 
 # Project target.
 target=android-19
-proguard.config=proguard.cfg
\ No newline at end of file