diff --git a/awx/main/tests/functional/api/test_host_filter.py b/awx/main/tests/functional/api/test_host_filter.py
new file mode 100644
index 0000000000..8a19c24e2d
--- /dev/null
+++ b/awx/main/tests/functional/api/test_host_filter.py
@@ -0,0 +1,49 @@
+# TODO: As of writing this our only concern is ensuring that the fact feature is reflected in the Host endpoint.
+# Other host tests should live here to make this test suite more complete.
+import pytest
+import urllib
+
+from awx.api.versioning import reverse
+
+from awx.main.models import Organization, Host, Group, Inventory
+
+
+@pytest.fixture
+def inventory_structure():
+    org = Organization.objects.create(name="org")
+    inv = Inventory.objects.create(name="inv", organization=org)
+    Host.objects.create(name="host1", inventory=inv)
+    Host.objects.create(name="host2", inventory=inv)
+    Host.objects.create(name="host3", inventory=inv)
+    Group.objects.create(name="g1", inventory=inv)
+    Group.objects.create(name="g2", inventory=inv)
+    Group.objects.create(name="g3", inventory=inv)
+
+
+@pytest.mark.django_db
+def test_q1(inventory_structure, get, user):
+    def evaluate_query(query, expected_hosts):
+        url = reverse('api:host_list')
+        get_params = "?host_filter=%s" % urllib.quote(query, safe='')
+        response = get(url + get_params, user('admin', True))
+
+        hosts = response.data['results']
+
+        assert len(expected_hosts) == len(hosts)
+
+        host_ids = [host['id'] for host in hosts]
+        for i, expected_host in enumerate(expected_hosts):
+            assert expected_host.id in host_ids
+
+    hosts = Host.objects.all()
+    groups = Group.objects.all()
+
+    groups[0].hosts.add(hosts[0], hosts[1])
+    groups[1].hosts.add(hosts[0], hosts[1], hosts[2])
+
+    query = '(name="host1" and groups__name="g1")'
+    evaluate_query(query, [hosts[0]])
+
+    query = '(name="host1" and groups__name="g1") or (name="host3" and groups__name="g2")'
+    evaluate_query(query, [hosts[0], hosts[2]])
+