diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java b/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java
index b13344bee2..f370e960de 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java
@@ -87,25 +87,12 @@ public boolean remove(Node node) {
         return innerList.remove(node);
     }
 
-    public boolean removeFirst() {
-        if (innerList.size() < 1) {
-            return false;
-        }
-        Node node = innerList.get(0);
-        notifyElementRemoved(0, node);
-        node.setParentNode(null);
-        return innerList.remove(0) != null;
+    public N removeFirst() {
+        return remove(0);
     }
 
-    public boolean removeLast() {
-        if (innerList.size() < 1) {
-            return false;
-        }
-        int index = innerList.size() - 1;
-        Node node = innerList.get(index);
-        notifyElementRemoved(index, node);
-        node.setParentNode(null);
-        return innerList.remove(index) != null;
+    public N removeLast() {
+        return remove(innerList.size() - 1);
     }
 
     @SafeVarargs
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/NodeListTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/NodeListTest.java
index 5d2fd8680f..8e4d568bde 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/NodeListTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/NodeListTest.java
@@ -152,11 +152,10 @@ public void removeFirstNode() {
         assertEquals(cd.getMembers().size(), 4);
 
         for (int i = 3; i >= 0; i--) {
-            assertTrue(cd.getMembers().removeFirst());
+            assertTrue(cd.getMembers().removeFirst() != null);
             assertEquals(cd.getMembers().size(), i);
         }
 
-        assertFalse(cd.getMembers().removeFirst());
         assertEquals(cd.getMembers().size(), 0);
     }
 
@@ -173,11 +172,10 @@ public void removeLastNode() {
         assertEquals(cd.getMembers().size(), 4);
 
         for (int i = 3; i >= 0; i--) {
-            assertTrue(cd.getMembers().removeLast());
+            assertTrue(cd.getMembers().removeLast() != null);
             assertEquals(cd.getMembers().size(), i);
         }
 
-        assertFalse(cd.getMembers().removeLast());
         assertEquals(cd.getMembers().size(), 0);
     }