diff --git a/app/src/test/java/com/termux/app/TermuxActivityTest.java b/app/src/test/java/com/termux/app/TermuxActivityTest.java
index e8d811a0..1763bfd4 100644
--- a/app/src/test/java/com/termux/app/TermuxActivityTest.java
+++ b/app/src/test/java/com/termux/app/TermuxActivityTest.java
@@ -2,13 +2,14 @@ package com.termux.app;
 
 import junit.framework.TestCase;
 
+import java.util.Collections;
 import java.util.LinkedHashSet;
 
 public class TermuxActivityTest extends TestCase {
 
     private void assertUrlsAre(String text, String... urls) {
         LinkedHashSet<String> expected = new LinkedHashSet<>();
-        for (String url : urls) expected.add(url);
+        Collections.addAll(expected, urls);
         assertEquals(expected, TermuxActivity.extractUrls(text));
     }
 
diff --git a/app/src/test/java/com/termux/terminal/TerminalTestCase.java b/app/src/test/java/com/termux/terminal/TerminalTestCase.java
index 22d52aab..a04f62a3 100644
--- a/app/src/test/java/com/termux/terminal/TerminalTestCase.java
+++ b/app/src/test/java/com/termux/terminal/TerminalTestCase.java
@@ -18,7 +18,7 @@ import com.termux.terminal.TerminalOutput;
 public abstract class TerminalTestCase extends TestCase {
 
 	public static class MockTerminalOutput extends TerminalOutput {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		public final List<ChangedTitle> titleChanges = new ArrayList<>();
 		public final List<String> clipboardPuts = new ArrayList<>();
 		public int bellsRung = 0;
@@ -117,7 +117,7 @@ public abstract class TerminalTestCase extends TestCase {
 	}
 
 	private static final class LineWrapper {
-		TerminalRow mLine;
+		final TerminalRow mLine;
 
 		public LineWrapper(TerminalRow line) {
 			mLine = line;