diff --git a/build.gradle b/build.gradle
index 9436cc9..71d2fd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
-        classpath 'org.robolectric:robolectric-gradle-plugin:0.14.+'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eaec3a1..68e7a1b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Feb 13 17:44:35 PST 2015
+#Thu Sep 03 08:11:07 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip
diff --git a/yearclass/build.gradle b/yearclass/build.gradle
index 4ce42bd..2c4e0e1 100644
--- a/yearclass/build.gradle
+++ b/yearclass/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'robolectric'
 
 repositories {
     jcenter()
@@ -15,25 +14,20 @@ android {
         versionCode 1
         versionName "1.0"
     }
-
-    sourceSets {
-        androidTest.setRoot('src/androidTest')
-    }
-}
-
-robolectric {
-    include '**/*Test.class'
-    exclude '**/espresso/**/*.class'
 }
 
 dependencies {
-    androidTestCompile 'junit:junit:4.12'
-    androidTestCompile('org.robolectric:robolectric:2.4') {
-        exclude module: 'commons-logging'
-        exclude module: 'httpclient'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:2.0.5-beta'
+    testCompile 'org.robolectric:robolectric:3.0'
+    testCompile ('org.powermock:powermock-api-mockito:1.6.2') {
+        exclude module: 'hamcrest-core'
+        exclude module: 'objenesis'
+    }
+    testCompile ('org.powermock:powermock-module-junit4:1.6.2') {
+        exclude module: 'hamcrest-core'
+        exclude module: 'objenesis'
     }
-    androidTestCompile 'org.powermock:powermock-api-mockito:1.6.1'
-    androidTestCompile 'org.powermock:powermock-module-junit4:1.6.1'
 }
 
 apply from: rootProject.file('release.gradle')
\ No newline at end of file
diff --git a/yearclass/src/androidTest/java/com/facebook/device/yearclass/YearClassTest.java b/yearclass/src/test/java/com/facebook/device/yearclass/YearClassTest.java
similarity index 100%
rename from yearclass/src/androidTest/java/com/facebook/device/yearclass/YearClassTest.java
rename to yearclass/src/test/java/com/facebook/device/yearclass/YearClassTest.java