diff --git a/mercury/forms.py b/mercury/forms.py
index 2d096c7c..7429c289 100644
--- a/mercury/forms.py
+++ b/mercury/forms.py
@@ -40,9 +40,9 @@ class Meta:
         model = GFConfig
         fields = ["gf_name", "gf_host", "gf_token"]
         labels = {
-            "gf_name": "Host Label",
-            "gf_host": "Host Address",
-            "gf_token": 'API Token (Without "Bearer" prefix)',
+            "gf_name": "Label (e.g. remote, local)",
+            "gf_host": "Hostname (e.g. https://abc123.grafana.net, localhost:3000)",
+            "gf_token": "API Token",
         }
 
 
diff --git a/mercury/templates/gf_configs.html b/mercury/templates/gf_configs.html
index 5ced72e3..efcb0b8c 100644
--- a/mercury/templates/gf_configs.html
+++ b/mercury/templates/gf_configs.html
@@ -32,7 +32,7 @@ <h2>Existing Grafana Hosts</h2>
                     {% for item in configs %}
                         <tr>
                             <th>{{ item.gf_name }}</th>
-                            <td>{{ item.gf_host }}</td>
+                            <td><a href="{{ item.gf_host }}">{{ item.gf_host }}</a></td>
                             <td>{{ item.gf_current }}</td>
                             <td><a href="update/{{ item.id }}">Set as current</a></td>
                             <td><a href="delete/{{ item.id }}">Delete</a></td>
diff --git a/mercury/tests/test_grafana.py b/mercury/tests/test_grafana.py
index a8c33694..434bcc5e 100644
--- a/mercury/tests/test_grafana.py
+++ b/mercury/tests/test_grafana.py
@@ -8,8 +8,11 @@
 import os
 
 # default host and token, use this if user did not provide anything
-HOST = "https://dbc291.grafana.net"
-TOKEN = "eyJrIjoiRTQ0cmNGcXRybkZlUUNZWmRvdFI0UlMwdFVYVUt3bzgiLCJuIjoia2V5IiwiaWQiOjF9"
+HOST = "https://mercurytests.grafana.net"
+TOKEN = (
+    "eyJrIjoiUm81MzlOUlRhalhGUFJ5OVVMNTZGTTZIdT"
+    "dvVURDSzIiLCJuIjoiYXBpX2tleSIsImlkIjoxfQ=="
+)
 
 
 # This test needs to have access to a test deployment of grafana, otherwise