diff --git a/app/src/androidTest/assets/Views/RingView/render.png b/app/src/androidTest/assets/Views/RingView/render.png
new file mode 100644
index 000000000..c77355c7c
Binary files /dev/null and b/app/src/androidTest/assets/Views/RingView/render.png differ
diff --git a/app/src/androidTest/assets/Views/RingView/renderDifferentParams.png b/app/src/androidTest/assets/Views/RingView/renderDifferentParams.png
new file mode 100644
index 000000000..02dfdf803
Binary files /dev/null and b/app/src/androidTest/assets/Views/RingView/renderDifferentParams.png differ
diff --git a/app/src/androidTest/assets/Views/RingView/renderLongLabel.png b/app/src/androidTest/assets/Views/RingView/renderLongLabel.png
new file mode 100644
index 000000000..48b9998ab
Binary files /dev/null and b/app/src/androidTest/assets/Views/RingView/renderLongLabel.png differ
diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/views/RingViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/views/RingViewTest.java
index c308fe596..06f2ac901 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/unit/views/RingViewTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/unit/views/RingViewTest.java
@@ -24,6 +24,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.isoron.uhabits.helpers.ColorHelper;
 import org.isoron.uhabits.views.RingView;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -33,16 +34,45 @@ import java.io.IOException;
 @SmallTest
 public class RingViewTest extends ViewTest
 {
-    @Test
-    public void renderTest1() throws IOException
+    private RingView view;
+
+    @Before
+    public void setup()
     {
-        RingView view = new RingView(targetContext);
+        super.setup();
+
+        view = new RingView(targetContext);
         view.setLabel("Hello world");
         view.setPercentage(0.6f);
         view.setColor(ColorHelper.palette[0]);
         view.setMaxDiameter(dpToPixels(100));
+    }
+
+    @Test
+    public void render_base() throws IOException
+    {
         measureView(dpToPixels(100), dpToPixels(100), view);
+        assertRenders(view, "Views/RingView/render.png");
+    }
+
+    @Test
+    public void render_withLongLabel() throws IOException
+    {
+        view.setLabel("The quick brown fox jumps over the lazy fox");
+
+        measureView(dpToPixels(100), dpToPixels(100), view);
+        assertRenders(view, "Views/RingView/renderLongLabel.png");
+    }
+
+    @Test
+    public void render_withDifferentParams() throws IOException
+    {
+        view.setLabel("Habit Strength");
+        view.setPercentage(0.25f);
+        view.setMaxDiameter(dpToPixels(50));
+        view.setColor(ColorHelper.palette[5]);
 
-        assertRenders(view, "Views/RingView/renderTest1.png");
+        measureView(dpToPixels(200), dpToPixels(200), view);
+        assertRenders(view, "Views/RingView/renderDifferentParams.png");
     }
 }