diff --git a/.gitignore b/.gitignore
index 26796a0..d6ffd88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ S3A*
 issues/
 *.egg-info/
 *.gz
+*.swp
diff --git a/hda/api.py b/hda/api.py
index 678a2dd..df28897 100644
--- a/hda/api.py
+++ b/hda/api.py
@@ -127,6 +127,8 @@ def _run(self, query):
 
         sleep = 1
         while status != "completed":
+            if status == "failed":
+                raise Exception(result["message"])
             assert status in ["started", "running"]
             self.debug("Sleeping %s seconds", sleep)
             time.sleep(sleep)
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..d276e0f
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+addopts=-s --verbose
+testpaths = tests
diff --git a/tests/test_hda.py b/tests/test_hda.py
new file mode 100644
index 0000000..f7bdf66
--- /dev/null
+++ b/tests/test_hda.py
@@ -0,0 +1,86 @@
+# Copyright 2021 European Centre for Medium-Range Weather Forecasts (ECMWF)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation nor
+# does it submit to any jurisdiction.
+
+import os
+
+import pytest
+
+from hda import Client
+
+NO_HDARC = not os.path.exists(os.path.expanduser("~/.hdarc")) and (
+    "HDA_USER" not in os.environ or "HDA_PASSWORD" not in os.environ
+)
+
+
+@pytest.mark.skipif(NO_HDARC, reason="No access to HDA")
+def test_hda_1():
+    c = Client(url="https://wekeo-broker.apps.mercator.dpi.wekeo.eu/databroker")
+
+    r = {
+        "datasetId": "EO:EUM:DAT:SENTINEL-3:OL_1_EFR___",
+        "boundingBoxValues": [
+            {
+                "name": "bbox",
+                "bbox": [
+                    1.2653132076552462,
+                    43.50759094045819,
+                    1.575030022744999,
+                    43.711525020845585,
+                ],
+            }
+        ],
+        "dateRangeSelectValues": [
+            {
+                "name": "position",
+                "start": "2021-07-03T00:00:00.000Z",
+                "end": "2021-07-04T00:00:00.000Z",
+            }
+        ],
+        "stringChoiceValues": [
+            {"name": "platformname", "value": "Sentinel-3"},
+            {"name": "producttype", "value": "OL_1_EFR___"},
+        ],
+    }
+    matches = c.search(r)
+    print(matches)
+    assert len(matches.results) == 2, matches
+    # Too large to download
+    # matches.download()
+
+
+@pytest.mark.skipif(NO_HDARC, reason="No access to HDA")
+def test_hda_2():
+    c = Client(url="https://wekeo-broker.apps.mercator.dpi.wekeo.eu/databroker")
+
+    r = {
+        "datasetId": "EO:ECMWF:DAT:ERA5_HOURLY_VARIABLES_ON_PRESSURE_LEVELS",
+        "stringChoiceValues": [{"name": "format", "value": "grib"}],
+        "multiStringSelectValues": [
+            {"name": "variable", "value": ["temperature"]},
+            {"name": "pressure_level", "value": ["500"]},
+            {"name": "product_type", "value": ["ensemble_mean"]},
+            {"name": "year", "value": ["2014"]},
+            {"name": "month", "value": ["11"]},
+            {"name": "day", "value": ["10"]},
+            {"name": "time", "value": ["12:00"]},
+        ],
+    }
+
+    matches = c.search(r)
+    assert len(matches.results) == 1, matches
+    matches.download()