diff --git a/gbpclient/gbp/v2_0/groupbasedpolicy.py b/gbpclient/gbp/v2_0/groupbasedpolicy.py
index ac88abf..a5bf63b 100644
--- a/gbpclient/gbp/v2_0/groupbasedpolicy.py
+++ b/gbpclient/gbp/v2_0/groupbasedpolicy.py
@@ -675,8 +675,8 @@ class CreatePolicyClassifier(neutronV20.CreateCommand):
             help=_('A description for the policy classifier'))
         parser.add_argument(
             '--protocol',
-            choices=['tcp', 'udp', 'icmp', ''],
-            help=_('A protocol value. When not set, all protocols are '
+            help=_('A protocol value: tcp, udp, icmp or a protocol number '
+                   'between 0 and 255. When not set, all protocols are '
                    'matched'))
         parser.add_argument(
             '--port-range',
@@ -726,8 +726,8 @@ class UpdatePolicyClassifier(neutronV20.UpdateCommand):
             help=_('New description for the policy classifier'))
         parser.add_argument(
             '--protocol',
-            choices=['tcp', 'udp', 'icmp', ''],
-            help=_('New protocol value '
+            help=_('New protocol value: tcp, udp, icmp or a protocol number '
+                   'between 0 and 255 '
                    '(use empty string \'\' to unset and match all protocols)'))
         parser.add_argument(
             '--port-range',
diff --git a/gbpclient/tests/unit/test_cli20_policyclassifier.py b/gbpclient/tests/unit/test_cli20_policyclassifier.py
index ce16b79..b2e895e 100644
--- a/gbpclient/tests/unit/test_cli20_policyclassifier.py
+++ b/gbpclient/tests/unit/test_cli20_policyclassifier.py
@@ -45,26 +45,26 @@ class CLITestV20PolicyClassifierJSON(test_cli20.CLITestV20Base):
         tenant_id = 'my-tenant'
         description = 'My PolicyClassifier'
         my_id = 'my-id'
-        protocol = 'tcp'
         port_range = '10-80'
         direction = 'in'
         shared = 'true'
-        args = ['--tenant-id', tenant_id,
-                '--description', description,
-                '--protocol', protocol,
-                '--port-range', port_range,
-                '--direction', direction,
-                '--shared', shared,
-                name]
-        position_names = ['name', ]
-        position_values = [name, ]
-        self._test_create_resource(resource, cmd, name, my_id, args,
-                                   position_names, position_values,
-                                   tenant_id=tenant_id,
-                                   description=description,
-                                   protocol=protocol,
-                                   port_range=port_range,
-                                   direction=direction, shared=shared)
+        for protocol in ['tcp', 'icmp', 'udp', '50']:
+            args = ['--tenant-id', tenant_id,
+                    '--description', description,
+                    '--protocol', protocol,
+                    '--port-range', port_range,
+                    '--direction', direction,
+                    '--shared', shared,
+                    name]
+            position_names = ['name', ]
+            position_values = [name, ]
+            self._test_create_resource(resource, cmd, name, my_id, args,
+                                       position_names, position_values,
+                                       tenant_id=tenant_id,
+                                       description=description,
+                                       protocol=protocol,
+                                       port_range=port_range,
+                                       direction=direction, shared=shared)
 
     def test_list_policy_classifiers(self):
         """grouppolicy-policy-classifier-list."""
@@ -121,24 +121,24 @@ class CLITestV20PolicyClassifierJSON(test_cli20.CLITestV20Base):
 
     def test_update_policy_classifier_with_allparams(self):
         resource = 'policy_classifier'
-        protocol = 'tcp'
         port_range = '10-80'
         direction = 'in'
         cmd = gbp.UpdatePolicyClassifier(test_cli20.MyApp(sys.stdout), None)
         my_id = 'someid'
         shared = 'true'
-        body = {
-            'protocol': protocol,
-            'port_range': port_range,
-            'direction': direction,
-            'shared': shared
-        }
-        args = [my_id,
-                '--protocol', protocol,
-                '--port-range', port_range,
-                '--direction', direction,
-                '--shared', shared, ]
-        self._test_update_resource(resource, cmd, my_id, args, body)
+        for protocol in ['tcp', 'icmp', 'udp', '50']:
+            body = {
+                'protocol': protocol,
+                'port_range': port_range,
+                'direction': direction,
+                'shared': shared
+            }
+            args = [my_id,
+                    '--protocol', protocol,
+                    '--port-range', port_range,
+                    '--direction', direction,
+                    '--shared', shared, ]
+            self._test_update_resource(resource, cmd, my_id, args, body)
 
     def test_delete_policy_classifier(self):
         """grouppolicy-policy-classifier-delete my-id."""