diff --git a/ceilometer/tests/api/v2/test_statistics_scenarios.py b/ceilometer/tests/api/v2/test_statistics_scenarios.py
index 3fd1bb4f3..6d8b9179e 100644
--- a/ceilometer/tests/api/v2/test_statistics_scenarios.py
+++ b/ceilometer/tests/api/v2/test_statistics_scenarios.py
@@ -1470,12 +1470,13 @@ class TestSelectableAggregates(FunctionalTest,
     def test_bad_selectable_parameterized_aggregate(self):
         agg_args = {'aggregate.func': 'cardinality',
                     'aggregate.param': 'injection_attack'}
-        resp = self.get_json(self.PATH, expect_errors=True,
+        resp = self.get_json(self.PATH, status=[400],
                              groupby=['project_id'], **agg_args)
-        self.assertTrue(400, resp.status_code)
-        self.assertTrue('error_message' in resp.json)
-        self.assertEqual('Bad aggregate: cardinality.injection_attack',
-                         resp.json['error_message'].get('faultstring'))
+        self.assertTrue('error_message' in resp)
+        self.assertEqual(resp['error_message'].get('faultcode'),
+                         'Client')
+        self.assertEqual(resp['error_message'].get('faultstring'),
+                         'Bad aggregate: cardinality.injection_attack')
 
 
 class TestUnparameterizedAggregates(FunctionalTest,
diff --git a/ceilometer/tests/base.py b/ceilometer/tests/base.py
index 059a69563..998f105a9 100644
--- a/ceilometer/tests/base.py
+++ b/ceilometer/tests/base.py
@@ -59,6 +59,8 @@ def _skip_decorator(func):
     def skip_if_not_implemented(*args, **kwargs):
         try:
             return func(*args, **kwargs)
+        except AssertionError:
+            raise
         except NotImplementedError as e:
             raise testcase.TestSkipped(six.text_type(e))
         except Exception as e: