diff --git a/exercises/linked-list/build.gradle b/exercises/linked-list/build.gradle
index 5a25a2896..d019b23c7 100644
--- a/exercises/linked-list/build.gradle
+++ b/exercises/linked-list/build.gradle
@@ -8,7 +8,6 @@ repositories {
 
 dependencies {
   testCompile "junit:junit:4.12"
-  testCompile "org.assertj:assertj-core:3.2.0"
 }
 test {
   testLogging {
diff --git a/exercises/linked-list/src/test/java/DequeTest.java b/exercises/linked-list/src/test/java/DequeTest.java
index f4ea27f9f..4b6888be5 100644
--- a/exercises/linked-list/src/test/java/DequeTest.java
+++ b/exercises/linked-list/src/test/java/DequeTest.java
@@ -1,8 +1,9 @@
 import org.junit.Before;
-import org.junit.Test;
 import org.junit.Ignore;
+import org.junit.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 public class DequeTest {
     private Deque<Integer> subject;
@@ -17,8 +18,8 @@ public void setUp() {
     public void testPushPop() {
         subject.push(10);
         subject.push(20);
-        assertThat(subject.pop()).isEqualTo(20);
-        assertThat(subject.pop()).isEqualTo(10);
+        assertThat(subject.pop(), is(20));
+        assertThat(subject.pop(), is(10));
     }
 
     @Ignore
@@ -26,8 +27,8 @@ public void testPushPop() {
     public void testPushShift() {
         subject.push(10);
         subject.push(20);
-        assertThat(subject.shift()).isEqualTo(10);
-        assertThat(subject.shift()).isEqualTo(20);
+        assertThat(subject.shift(), is(10));
+        assertThat(subject.shift(), is(20));
     }
 
     @Ignore
@@ -35,8 +36,8 @@ public void testPushShift() {
     public void testUnshiftShift() {
         subject.unshift(10);
         subject.unshift(20);
-        assertThat(subject.shift()).isEqualTo(20);
-        assertThat(subject.shift()).isEqualTo(10);
+        assertThat(subject.shift(), is(20));
+        assertThat(subject.shift(), is(10));
     }
 
     @Ignore
@@ -44,8 +45,8 @@ public void testUnshiftShift() {
     public void testUnshiftPop() {
         subject.unshift(10);
         subject.unshift(20);
-        assertThat(subject.pop()).isEqualTo(10);
-        assertThat(subject.pop()).isEqualTo(20);
+        assertThat(subject.pop(), is(10));
+        assertThat(subject.pop(), is(20));
     }
 
     @Ignore
@@ -53,15 +54,15 @@ public void testUnshiftPop() {
     public void testExample() {
         subject.push(10);
         subject.push(20);
-        assertThat(subject.pop()).isEqualTo(20);
+        assertThat(subject.pop(), is(20));
 
         subject.push(30);
-        assertThat(subject.shift()).isEqualTo(10);
+        assertThat(subject.shift(), is(10));
 
         subject.unshift(40);
         subject.push(50);
-        assertThat(subject.shift()).isEqualTo(40);
-        assertThat(subject.pop()).isEqualTo(50);
-        assertThat(subject.shift()).isEqualTo(30);
+        assertThat(subject.shift(), is(40));
+        assertThat(subject.pop(), is(50));
+        assertThat(subject.shift(), is(30));
     }
 }