diff --git a/app/src/main/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuite.java b/app/src/main/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuite.java
index d5f170a67..5f778a0cb 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuite.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuite.java
@@ -44,8 +44,6 @@ public static CircumventionSuite initForAutoRun() {
                 list.add(new Psiphon());
             if (pm == null || pm.isTestTor())
                 list.add(new Tor());
-            if (pm == null || pm.isTestRiseupVPN())
-                list.add(new RiseupVPN());
             super.setTestList(Lists.transform(list, test -> {
                 if (getAutoRun()) test.setOrigin(AbstractTest.AUTORUN);
                 return test;
diff --git a/app/src/test/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuiteTest.java b/app/src/test/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuiteTest.java
index 0e71d16c9..7ed613f70 100644
--- a/app/src/test/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuiteTest.java
+++ b/app/src/test/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuiteTest.java
@@ -24,7 +24,6 @@ public class CircumventionSuiteTest {
     public void getTestList_empty() {
         when(pm.isTestPsiphon()).thenReturn(false);
         when(pm.isTestTor()).thenReturn(false);
-        when(pm.isTestRiseupVPN()).thenReturn(false);
 
         AbstractTest[] tests = suite.getTestList(pm);
 
@@ -39,10 +38,9 @@ public void getTestList_full() {
 
         List<AbstractTest> tests = Arrays.asList(suite.getTestList(pm));
 
-        assertEquals(3, tests.size());
+        assertEquals(2, tests.size());
         assertTrue(findTestClass(tests, Psiphon.class));
         assertTrue(findTestClass(tests, Tor.class));
-        assertTrue(findTestClass(tests, RiseupVPN.class));
     }
 
     private boolean findTestClass(List<AbstractTest> tests, Class<? extends AbstractTest> klass) {