diff --git a/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap b/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap
index 0c3e8c86dd4..65d4b5ab953 100644
--- a/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap
+++ b/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap
@@ -5,20 +5,34 @@ exports[`Render should render component 1`] = `
   className="gf-form-group"
 >
   <div
-    className="gf-form max-width-30"
+    className="gf-form-inline"
   >
-    <Component
-      tooltip="The name is used when you select the data source in panels. The Default data source ispreselected in new panels."
+    <div
+      className="gf-form max-width-30"
+      style={
+        Object {
+          "marginRight": "3px",
+        }
+      }
     >
-      Name
-    </Component>
-    <input
-      className="gf-form-input max-width-23"
+      <Component
+        tooltip="The name is used when you select the data source in panels. The Default data source ispreselected in new panels."
+      >
+        Name
+      </Component>
+      <input
+        className="gf-form-input max-width-23"
+        onChange={[Function]}
+        placeholder="Name"
+        required={true}
+        type="text"
+        value="Graphite"
+      />
+    </div>
+    <Switch
+      checked={false}
+      label="Default"
       onChange={[Function]}
-      placeholder="Name"
-      required={true}
-      type="text"
-      value="Graphite"
     />
   </div>
 </div>
diff --git a/public/app/features/datasources/settings/__snapshots__/DataSourceSettings.test.tsx.snap b/public/app/features/datasources/settings/__snapshots__/DataSourceSettings.test.tsx.snap
index f95055c9095..dafff91a6f5 100644
--- a/public/app/features/datasources/settings/__snapshots__/DataSourceSettings.test.tsx.snap
+++ b/public/app/features/datasources/settings/__snapshots__/DataSourceSettings.test.tsx.snap
@@ -14,7 +14,9 @@ exports[`Render should render alpha info text 1`] = `
       >
         <BasicSettings
           dataSourceName="gdev-cloudwatch"
-          onChange={[Function]}
+          isDefault={false}
+          onDefaultChange={[Function]}
+          onNameChange={[Function]}
         />
         <div
           className="grafana-info-box"
@@ -111,7 +113,9 @@ exports[`Render should render beta info text 1`] = `
       >
         <BasicSettings
           dataSourceName="gdev-cloudwatch"
-          onChange={[Function]}
+          isDefault={false}
+          onDefaultChange={[Function]}
+          onNameChange={[Function]}
         />
         <div
           className="grafana-info-box"
@@ -208,7 +212,9 @@ exports[`Render should render component 1`] = `
       >
         <BasicSettings
           dataSourceName="gdev-cloudwatch"
-          onChange={[Function]}
+          isDefault={false}
+          onDefaultChange={[Function]}
+          onNameChange={[Function]}
         />
         <PluginSettings
           dataSource={
@@ -300,7 +306,9 @@ exports[`Render should render is ready only message 1`] = `
       >
         <BasicSettings
           dataSourceName="gdev-cloudwatch"
-          onChange={[Function]}
+          isDefault={false}
+          onDefaultChange={[Function]}
+          onNameChange={[Function]}
         />
         <div
           className="grafana-info-box span8"