diff --git a/app/src/test/java/fr/free/nrw/commons/UtilsFixExtensionTest.java b/app/src/test/java/fr/free/nrw/commons/UtilsFixExtensionTest.java
new file mode 100644
index 000000000..de0a90f4b
--- /dev/null
+++ b/app/src/test/java/fr/free/nrw/commons/UtilsFixExtensionTest.java
@@ -0,0 +1,57 @@
+package fr.free.nrw.commons;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UtilsFixExtensionTest {
+
+    @Test public void jpegResultsInJpg() {
+        Assert.assertThat(Utils.fixExtension("SampleFile.jpeg", "jpeg"), is("SampleFile.jpg"));
+    }
+
+    @Test public void capitalJpegWithNoHintResultsInJpg() {
+        Assert.assertThat(Utils.fixExtension("SampleFile.JPEG", null), is("SampleFile.jpg"));
+    }
+
+    @Test public void jpegWithBogusHintResultsInJpg() {
+        Assert.assertThat(Utils.fixExtension("SampleFile.jpeg", null), is("SampleFile.jpg"));
+    }
+
+    @Test public void jpegToCapitalJpegResultsInJpg() {
+        Assert.assertThat(Utils.fixExtension("SampleFile.jpeg", "JPEG"), is("SampleFile.jpg"));
+    }
+
+    @Test public void jpgToJpegResultsInJpg() {
+        Assert.assertThat(Utils.fixExtension("SampleFile.jpg", "jpeg"), is("SampleFile.jpg"));
+    }
+
+    @Test public void jpegToJpgResultsInJpg() {
+        Assert.assertThat(Utils.fixExtension("SampleFile.jpeg", "jpg"), is("SampleFile.jpg"));
+    }
+
+    @Test public void jpgRemainsJpg() {
+        Assert.assertThat(Utils.fixExtension("SampleFile.jpg", "jpg"), is("SampleFile.jpg"));
+    }
+
+    @Test public void pngRemainsPng() {
+        Assert.assertThat(Utils.fixExtension("SampleFile.png", "png"), is("SampleFile.png"));
+    }
+
+    @Test public void jpgHintResultsInJpg() {
+        Assert.assertThat(Utils.fixExtension("SampleFile", "jpg"), is("SampleFile.jpg"));
+    }
+
+    @Test public void jpegHintResultsInJpg() {
+        Assert.assertThat(Utils.fixExtension("SampleFile", "jpeg"), is("SampleFile.jpg"));
+    }
+
+    @Test public void dotLessJpgToJpgResultsInJpg() {
+        Assert.assertThat(Utils.fixExtension("SAMPLEjpg", "jpg"), is("SAMPLEjpg.jpg"));
+    }
+
+    @Test public void inWordJpegToJpgResultsInJpg() {
+        Assert.assertThat(Utils.fixExtension("X.jpeg.SAMPLE", "jpg"),is("X.jpeg.SAMPLE.jpg"));
+    }
+}
diff --git a/app/src/test/java/fr/free/nrw/commons/UtilsTest.java b/app/src/test/java/fr/free/nrw/commons/UtilsTest.java
index b684c7bbf..06e26ede4 100644
--- a/app/src/test/java/fr/free/nrw/commons/UtilsTest.java
+++ b/app/src/test/java/fr/free/nrw/commons/UtilsTest.java
@@ -1,57 +1,16 @@
 package fr.free.nrw.commons;
-import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
 
+import org.junit.Assert;
+import org.junit.Test;
 
 public class UtilsTest {
-
-    @Test public void fixExtensionJpegToJpeg() {
-        assertThat(Utils.fixExtension("SampleFile.jpeg", "jpeg"), is("SampleFile.jpg"));
-    }
-
-    @Test public void fixExtensionJpegToJpg() {
-        assertThat(Utils.fixExtension("SampleFile.JPEG", null), is("SampleFile.jpg"));
-    }
-
-    @Test public void fixExtensionNull() {
-        assertThat(Utils.fixExtension("SampleFile.jpeg", "JPEG"), is("SampleFile.jpg"));
-    }
-
-    @Test public void fixExtensionJpgToJpeg() {
-        assertThat(Utils.fixExtension("SampleFile.jpg", "jpeg"), is("SampleFile.jpg"));
-    }
-
-    @Test public void fixExtensionJpgToJpg() {
-        assertThat(Utils.fixExtension("SampleFile.jpg", "jpg"), is("SampleFile.jpg"));
-    }
-
-    @Test public void fixExtensionPngToPng() {
-        assertThat(Utils.fixExtension("SampleFile.png", "png"), is("SampleFile.png"));
-    }
-
-    @Test public void fixExtensionEmptyToJpg() {
-        assertThat(Utils.fixExtension("SampleFile", "jpg"), is("SampleFile.jpg"));
-    }
-
-    @Test public void fixExtensionEmptyToJpeg() {
-        assertThat(Utils.fixExtension("SampleFile", "jpeg"), is("SampleFile.jpg"));
-    }
-
-    @Test public void fixExtensionJpgNotExtension() {
-        assertThat(Utils.fixExtension("SAMPLEjpg", "jpg"), is("SAMPLEjpg.jpg"));
-    }
-
-    @Test public void fixExtensionJpegNotExtension() {
-        assertThat(Utils.fixExtension("SAMPLE.jpeg.SAMPLE", "jpg"), is("SAMPLE.jpeg.SAMPLE.jpg"));
-    }
-
     @Test public void stripLocalizedStringPass() {
-        assertThat(Utils.stripLocalizedString("Hello"), is("Hello"));
+        Assert.assertThat(Utils.stripLocalizedString("Hello"), is("Hello"));
     }
 
     @Test public void stripLocalizedStringJa() {
-        assertThat(Utils.stripLocalizedString("\"こんにちは\"@ja"), is("こんにちは"));
+        Assert.assertThat(Utils.stripLocalizedString("\"こんにちは\"@ja"), is("こんにちは"));
     }
 }