diff --git a/library/build.gradle b/library/build.gradle
index 174ff02f8..2a4b471fc 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -33,8 +33,8 @@ android {
 }
 
 dependencies {
-    testCompile 'com.squareup:fest-android:1.0.7'
-    testCompile 'org.robolectric:robolectric:2.1.1'
+    testCompile 'com.squareup.assertj:assertj-android:1.0.0'
+    testCompile 'org.robolectric:robolectric:2.4'
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:support-v4:22.1.1'
 }
diff --git a/library/test/com/nostra13/universalimageloader/core/assist/ImageSizeTest.java b/library/test/com/nostra13/universalimageloader/core/assist/ImageSizeTest.java
index 6c6a0cd26..d31ca32e7 100644
--- a/library/test/com/nostra13/universalimageloader/core/assist/ImageSizeTest.java
+++ b/library/test/com/nostra13/universalimageloader/core/assist/ImageSizeTest.java
@@ -9,7 +9,7 @@
 import com.nostra13.universalimageloader.core.imageaware.ImageAware;
 import com.nostra13.universalimageloader.core.imageaware.ImageViewAware;
 import com.nostra13.universalimageloader.utils.ImageSizeUtils;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.android.api.Assertions.assertThat;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/library/test/com/nostra13/universalimageloader/core/download/BaseImageDownloaderTest.java b/library/test/com/nostra13/universalimageloader/core/download/BaseImageDownloaderTest.java
index 10cde24dd..31c6f1b5b 100644
--- a/library/test/com/nostra13/universalimageloader/core/download/BaseImageDownloaderTest.java
+++ b/library/test/com/nostra13/universalimageloader/core/download/BaseImageDownloaderTest.java
@@ -1,6 +1,6 @@
 package com.nostra13.universalimageloader.core.download;
 
-import org.fest.assertions.api.Assertions;
+import static org.assertj.android.api.Assertions.assertThat;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;