diff --git a/cove_iati/templates/cove_iati/explore.html b/cove_iati/templates/cove_iati/explore.html
index d387d1dc..60f49020 100644
--- a/cove_iati/templates/cove_iati/explore.html
+++ b/cove_iati/templates/cove_iati/explore.html
@@ -398,7 +398,7 @@ <h4><span class="glyphicon glyphicon-share"></span> Share</h4>
         </div>
         <h4><span class="glyphicon glyphicon-new-window"></span> Preview</h4>
         <p>Generate a private d-preview site with the IATI xml. For preview purposes only. Data will not be uploaded to the main live d-portal website.</p>
-        <p><a target="_blank" href="http://d-preview.codeforiati.org/upload?xmlurl={{ request.scheme }}://{{ request.get_host }}{% if conversion == 'unflatten' %}{{ converted_url }}{% else %}{{ original_file.url }}{% endif %}" class="btn btn-success btn-sm">Generate a d-preview</a></p>
+        <p><a target="_blank" href="https://preview.d-portal.iatistandard.org/upload?xmlurl={{ request.scheme }}://{{ request.get_host }}{% if conversion == 'unflatten' %}{{ converted_url }}{% else %}{{ original_file.url }}{% endif %}" class="btn btn-success btn-sm">Generate a d-preview</a></p>
         {% comment %}Translators: Paragraph that describes the application{% endcomment %}
         <br>
         <p>{% blocktrans %}After 7 days all uploaded data is deleted from our servers, and the results will no longer be available. Anyone using the link to this page after that will be shown a message that tells them the file has been removed.{% endblocktrans %}</p>
@@ -423,7 +423,7 @@ <h4>Merge indicators by title</h4>
           <p>This function will merge together any indicators in the result block, that share the same title. No other data will be altered or changed. This function is designed for instances where multiple periods exist within the same result/indicator, but are not uniquely referenced in the IATI standard or CoVE spreadsheet.<p/>
           {% if merge_indicator_output %}
           <p><a href="{{ merge_indicator_output }}">Output (xml)</a> {{ merge_indicator_output_file_size|filesizeformat }}</p>
-          <p><a target="_blank" href="http://d-preview.codeforiati.org/upload?xmlurl={{ request.scheme }}://{{ request.get_host }}{{ merge_indicator_output }}" class="btn btn-success btn-sm">Generate a d-preview</a></p>
+          <p><a target="_blank" href="https://preview.d-portal.iatistandard.org/upload?xmlurl={{ request.scheme }}://{{ request.get_host }}{{ merge_indicator_output }}" class="btn btn-success btn-sm">Generate a d-preview</a></p>
           {% else %}
           <p><a href="{% url 'explore_suffix' data_uuid 'merge_indicator' %}" class="btn btn-success btn-sm">Run</a></p>
           {% endif %}
diff --git a/cove_iati/tests_functional.py b/cove_iati/tests_functional.py
index 49751fc7..76f2be6c 100644
--- a/cove_iati/tests_functional.py
+++ b/cove_iati/tests_functional.py
@@ -6,6 +6,8 @@
 from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
 
 BROWSER = os.environ.get('BROWSER', 'ChromeHeadless')
 CHROME_SNAP = bool(os.environ.get('CHROME_SNAP', False))
@@ -129,6 +131,9 @@ def test_explore_iati_url_input(server_url, browser, httpserver, source_filename
 
     data_url = browser.current_url
 
+    WebDriverWait(browser, 10).until(
+        EC.presence_of_element_located((By.ID, "data-supplied"))
+    )
     # Click and un-collapse all explore sections
     all_sections = browser.find_elements(By.CLASS_NAME, 'panel-heading')
     for section in all_sections: