diff --git a/CRM/Contribute/Page/ContributionPage.php b/CRM/Contribute/Page/ContributionPage.php
index 9073ce204838..81a0521cc6b4 100644
--- a/CRM/Contribute/Page/ContributionPage.php
+++ b/CRM/Contribute/Page/ContributionPage.php
@@ -215,6 +215,7 @@ public function &onlineContributionLinks() {
           'title' => ts('Test-drive'),
           'url' => $urlString,
           'qs' => $urlParams . '&action=preview',
+          'fe' => TRUE, // Addresses https://lab.civicrm.org/dev/core/issues/658
           'uniqueName' => 'test_drive',
         ),
       );
diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
index 779aca3248c2..7603137137a5 100644
--- a/CRM/Core/Payment.php
+++ b/CRM/Core/Payment.php
@@ -1146,7 +1146,8 @@ protected function getNotifyUrl() {
       array(),
       TRUE,
       NULL,
-      FALSE
+      FALSE,
+      TRUE
     );
     return (stristr($url, '.')) ? $url : '';
   }