diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/overview/OverviewViewModel.kt b/app/src/main/java/org/openobservatory/ooniprobe/activity/overview/OverviewViewModel.kt
index b190b9747..ba9a1f79d 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/activity/overview/OverviewViewModel.kt
+++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/overview/OverviewViewModel.kt
@@ -16,12 +16,13 @@ import org.openobservatory.ooniprobe.common.disableTest
 import org.openobservatory.ooniprobe.common.enableTest
 import org.openobservatory.ooniprobe.model.database.InstalledDescriptor
 import org.openobservatory.ooniprobe.model.database.Result
+import org.openobservatory.ooniprobe.model.database.getNettests
 import java.text.SimpleDateFormat
 import java.util.Locale
 import javax.inject.Inject
 
 class TestGroupItem(
-    var selected: Boolean, override var name: String, override var inputs: List<String>?,
+        var selected: Boolean, override var name: String, override var inputs: List<String>?,
 ) : BaseNettest(name = name, inputs = inputs)
 
 
@@ -82,9 +83,9 @@ class OverviewViewModel @Inject constructor(var application: Application, var pr
     fun disableTest(name: String) {
         descriptor.value?.let {
             preferenceManager.disableTest(
-                name = name,
-                prefix = it.preferencePrefix(),
-                autoRun = true
+                    name = name,
+                    prefix = it.preferencePrefix(),
+                    autoRun = true
             )
         }
     }
@@ -92,9 +93,9 @@ class OverviewViewModel @Inject constructor(var application: Application, var pr
     fun enableTest(name: String) {
         descriptor.value?.let {
             preferenceManager.enableTest(
-                name = name,
-                prefix = it.preferencePrefix(),
-                autoRun = true
+                    name = name,
+                    prefix = it.preferencePrefix(),
+                    autoRun = true
             )
         }
     }
@@ -119,6 +120,7 @@ class OverviewViewModel @Inject constructor(var application: Application, var pr
     fun getIcon(): Int {
         return descriptor.value?.getDisplayIcon(application) ?: 0
     }
+
     fun getRunTime(): String? {
         return descriptor.value?.getRuntime(application, preferenceManager)?.toString()
     }
@@ -129,13 +131,13 @@ class OverviewViewModel @Inject constructor(var application: Application, var pr
                 DateUtils.getRelativeTimeSpanString(
                         time
                 ).toString()
-            }?: application.getString(R.string.Dashboard_Overview_LastRun_Never)
+            } ?: application.getString(R.string.Dashboard_Overview_LastRun_Never)
         }
     }
 
     fun getDescription(): String? {
         return descriptor.value?.let {
-            if (it is InstalledDescriptor){
+            if (it is InstalledDescriptor) {
                 return String.format(
                         "Created by %s on %s\n\n%s",
                         it.descriptor?.author,
@@ -148,6 +150,18 @@ class OverviewViewModel @Inject constructor(var application: Application, var pr
         }
     }
 
+    fun getAutomaticRunSwitchVisibility(): Int {
+        return descriptor.value?.let {
+            it.descriptor?.getNettests()?.let { nettests ->
+                if (nettests.count() > 1) {
+                    View.VISIBLE // if there are multiple tests, the switch should be visible.
+                } else {
+                    View.GONE // if there is only one test, the switch should be gone.
+                }
+            } ?: View.VISIBLE // if descriptor is not installed, it should be visible.
+        } ?: View.GONE // if descriptor is null, it should be gone
+    }
+
     companion object {
         const val SELECT_ALL = "SELECT_ALL"
         const val SELECT_SOME = "SELECT_SOME"
diff --git a/app/src/main/res/layout/activity_overview.xml b/app/src/main/res/layout/activity_overview.xml
index 8d78e8870..86b7a1295 100644
--- a/app/src/main/res/layout/activity_overview.xml
+++ b/app/src/main/res/layout/activity_overview.xml
@@ -179,11 +179,20 @@
                             app:richText="@{viewmodel.description}"
                             app:testName="@{viewmodel.descriptor.name}"/>
 
+                        <TextView
+                            android:id="@+id/settings"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Test Settings"
+                            android:layout_below="@+id/desc"
+                            style="?attr/textAppearanceHeadline6"
+                            android:paddingBottom="@dimen/item_padding_large"/>
+
                         <LinearLayout
                             android:id="@+id/automatic_updates_container"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_below="@+id/desc"
+                            android:layout_below="@+id/settings"
                             android:paddingBottom="16dp">
 
                             <TextView
@@ -202,24 +211,16 @@
                                 android:layout_height="wrap_content" />
                         </LinearLayout>
 
-                        <TextView
-                            android:id="@+id/run_automatically"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignEnd="@id/automatic_updates_container"
-                            android:layout_alignBottom="@id/automatic_updates_container"
-                            android:text="Run automatically" />
-
                         <LinearLayout
                             android:id="@+id/header_container"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_below="@+id/run_automatically">
+                            android:layout_below="@+id/automatic_updates_container">
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="Tests" />
+                                android:text="Run Tests automatically" />
 
                             <View
                                 android:layout_width="0dp"
@@ -231,7 +232,8 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:button="@drawable/check_box_custom_button"
-                                app:checkedState="indeterminate" />
+                                app:checkedState="indeterminate"
+                                android:visibility="@{viewmodel.automaticRunSwitchVisibility ,default = visible}"/>
                         </LinearLayout>
                     </RelativeLayout>