diff --git a/test/test_classifier_routes.py b/test/test_classifier_routes.py
index 4608dd2ed189b197bf3cc1eda7eafcf401a201f0..c7f945f72440efca94172f7953074f460b28c507 100644
--- a/test/test_classifier_routes.py
+++ b/test/test_classifier_routes.py
@@ -44,8 +44,6 @@ JUNIPER_LINK_METADATA = {
             "required": ["name", "description", "ipv4", "ipv6"],
             "additionalProperties": False
         },
-        # TODO: modify service-info so that "" entries are just omitted
-        #       (... rather than requiring 'oneOf')
         "service-info": {
             "type": "object",
             "properties": {
@@ -76,7 +74,15 @@ JUNIPER_LINK_METADATA = {
                 "interface_name": {"type": "string"},
                 "other_end_interface_name": {"type": "string"}
             },
-            # "required": ["name", "description", "ipv4", "ipv6"],
+            # TODO: modify service-info so that "" entries are just omitted
+            #       (... rather than requiring 'oneOf')
+            # TODO: put 'other_end_*' params in a sub dictionary
+            "required": [
+                "id", "name", "status",
+                "circuit_type", "service_type",
+                "project", "port", "manufacturer",
+                "equipment", "logical_unit", "card_id", "interface_name"
+            ],
             "additionalProperties": False
         }
     },