diff --git a/app/build.gradle b/app/build.gradle
index 4f89f71..bbe6c52 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "com.google.android.perftesting"
@@ -27,7 +27,7 @@ android {
 }
 
 dependencies {
-    String supportLibVersion = "23.1.1"
+    String supportLibVersion = "23.4.0"
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile "com.android.support:appcompat-v7:${supportLibVersion}"
     compile "com.android.support:recyclerview-v7:${supportLibVersion}"
@@ -35,13 +35,13 @@ dependencies {
     compile 'com.github.bumptech.glide:glide:3.6.1'
 
     // TODO(developer): Comment in the following dependencies to enable Espresso and related libraries in this project.
-    // Force the use of 23.1.0 of the annotations library because the app compile dependencies
-    // require this version transitively, but an androidTestCompile dependency requires a different
-    // version. See http://goo.gl/iH4WDq for more info.
+    // Force the use of a specific version of the annotations library because the app compile
+    // dependencies require this version transitively, but an androidTestCompile dependency
+    // requires a different version. See http://goo.gl/iH4WDq for more info.
 //     androidTestCompile "com.android.support:support-annotations:${supportLibVersion}"
-//     androidTestCompile 'com.android.support.test:runner:0.3'
-//     androidTestCompile 'com.android.support.test:rules:0.3'
-//     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'
+//     androidTestCompile 'com.android.support.test:runner:0.5'
+//     androidTestCompile 'com.android.support.test:rules:0.5'
+//     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
 }
 
 // Create performance testing tasks for all connected Android devices using a Gradle plugin defined