diff --git a/ci/roles/endpoint/defaults/main.yaml b/ci/roles/endpoint/defaults/main.yaml
new file mode 100644
index 00000000..ede5ca02
--- /dev/null
+++ b/ci/roles/endpoint/defaults/main.yaml
@@ -0,0 +1,9 @@
+expected_fields:
+  - id
+  - interface
+  - is_enabled
+  - links
+  - name
+  - region_id
+  - service_id
+  - url
diff --git a/ci/roles/endpoint/tasks/main.yml b/ci/roles/endpoint/tasks/main.yml
index ebcf6719..0d697f83 100644
--- a/ci/roles/endpoint/tasks/main.yml
+++ b/ci/roles/endpoint/tasks/main.yml
@@ -9,10 +9,13 @@
      state: present
   register: endpoint_test
 
-- name: Ensure service endpoint was created
+- debug: var=endpoint_test
+
+- name: Assert return values of endpoint module
   assert:
     that:
-      - endpoint_test.endpoint.id is defined
+      # allow new fields to be introduced but prevent fields from being removed
+      - expected_fields|difference(endpoint_test.endpoint.keys())|length == 0
 
 - name: Ensure service have the proper endpoint
   assert: