diff --git a/functional/test_preview.py b/functional/test_preview.py
index 4b9d77c..54f8a79 100644
--- a/functional/test_preview.py
+++ b/functional/test_preview.py
@@ -10,12 +10,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from heat_integrationtests.common import test
+from heat_integrationtests.functional import functional_base
 from heatclient import exc
 import six
 
 
-class StackPreviewTest(test.HeatIntegrationTest):
+class StackPreviewTest(functional_base.FunctionalTestsBase):
     template = '''
 heat_template_version: 2015-04-30
 parameters:
diff --git a/functional/test_template_resource.py b/functional/test_template_resource.py
index ef2f4f5..c05912c 100644
--- a/functional/test_template_resource.py
+++ b/functional/test_template_resource.py
@@ -740,7 +740,7 @@
         self.stack_resume(stack_identifier=stack_identifier)
 
 
-class ValidateFacadeTest(test.HeatIntegrationTest):
+class ValidateFacadeTest(functional_base.FunctionalTestsBase):
     """Prove that nested stack errors don't suck."""
 
     template = '''
diff --git a/scenario/templates/test_aodh_alarm.yaml b/scenario/templates/test_aodh_alarm.yaml
index 9218f56..d4c9745 100644
--- a/scenario/templates/test_aodh_alarm.yaml
+++ b/scenario/templates/test_aodh_alarm.yaml
@@ -25,7 +25,10 @@
       period: 60
       evaluation_periods: 1
       alarm_actions:
-        - {get_attr: [scaleup_policy, alarm_url]}
+        - str_replace:
+            template: trust+url
+            params:
+              url: {get_attr: [scaleup_policy, signal_url]}
       matching_metadata:
         metadata.metering.stack_id: {get_param: "OS::stack_id"}
 outputs: