diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
index f18245f02c..83293367d5 100644
--- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
+++ b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
@@ -79,7 +79,6 @@ public void run() {
                             assertEquals(Boolean.TRUE, get(key));
                         } catch (Throwable t) {
                             error.compareAndSet(null, t);
-                            t.printStackTrace();
                         }
                     }
                 }
@@ -91,6 +90,9 @@ public void run() {
         for (Thread thread : threads) {
             thread.join();
         }
-        assertNull(error.get(), String.valueOf(error.get()));
+        Throwable t = error.get();
+        if (t != null) {
+            throw new AssertionError(t);
+        }
     }
 }
diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
index 027ac2e77a..a760e9a04f 100644
--- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
+++ b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
@@ -115,7 +115,6 @@ public void run() {
                             assertEquals(Boolean.TRUE, get(key));
                         } catch (Throwable t) {
                             error.compareAndSet(null, t);
-                            t.printStackTrace();
                         }
                     }
                 }
@@ -127,6 +126,9 @@ public void run() {
         for (Thread thread : threads) {
             thread.join();
         }
-        assertNull(error.get(), String.valueOf(error.get()));
+        Throwable t = error.get();
+        if (t != null) {
+            throw new AssertionError(t);
+        }
     }
 }
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java
index d7cf77b23e..7bf6e26eb4 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java
@@ -552,6 +552,10 @@ protected static class Results {
 
         volatile String errorPath;
 
+        private int exceptionCount;
+
+        private int cycleCount;
+
         public Results(CollectResult result, RepositorySystemSession session) {
             this.result = result;
 
@@ -569,7 +573,8 @@ public synchronized String getErrorPath() {
         }
 
         public synchronized void addException(Dependency dependency, Exception e, List<DependencyNode> nodes) {
-            if (maxExceptions < 0 || result.getExceptions().size() < maxExceptions) {
+            if (maxExceptions < 0 || exceptionCount < maxExceptions) {
+                exceptionCount++;
                 result.addException(e);
                 if (errorPath == null) {
                     StringBuilder buffer = new StringBuilder(256);
@@ -592,7 +597,8 @@ public synchronized void addException(Dependency dependency, Exception e, List<D
         }
 
         public synchronized void addCycle(List<DependencyNode> nodes, int cycleEntry, Dependency dependency) {
-            if (maxCycles < 0 || result.getCycles().size() < maxCycles) {
+            if (maxCycles < 0 || cycleCount < maxCycles) {
+                cycleCount++;
                 result.addCycle(new DefaultDependencyCycle(nodes, cycleEntry, dependency));
             }
         }
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
index 182825840c..fe0c95cf5c 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
@@ -20,6 +20,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -737,7 +738,7 @@ public LocalArtifactResult find(RepositorySystemSession session, LocalArtifactRe
                 try {
                     result.setFile(TestFileUtils.createTempFile(""));
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    throw new UncheckedIOException(e);
                 }
                 return result;
             }
@@ -749,7 +750,7 @@ public LocalMetadataResult find(RepositorySystemSession session, LocalMetadataRe
                 try {
                     result.setFile(TestFileUtils.createTempFile(""));
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    throw new UncheckedIOException(e);
                 }
                 return result;
             }
@@ -802,7 +803,7 @@ public LocalArtifactResult find(RepositorySystemSession session, LocalArtifactRe
                 try {
                     result.setFile(TestFileUtils.createTempFile(""));
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    throw new UncheckedIOException(e);
                 }
                 return result;
             }
@@ -871,7 +872,7 @@ public LocalArtifactResult find(RepositorySystemSession session, LocalArtifactRe
                 try {
                     result.setFile(TestFileUtils.createTempFile(""));
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    throw new UncheckedIOException(e);
                 }
                 return result;
             }
@@ -972,7 +973,7 @@ public LocalArtifactResult find(RepositorySystemSession session, LocalArtifactRe
                 try {
                     result.setFile(TestFileUtils.createTempFile(""));
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    throw new UncheckedIOException(e);
                 }
                 return result;
             }
@@ -984,7 +985,7 @@ public LocalMetadataResult find(RepositorySystemSession session, LocalMetadataRe
                 try {
                     result.setFile(TestFileUtils.createTempFile(""));
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    throw new UncheckedIOException(e);
                 }
                 return result;
             }