diff --git a/.zuul.yaml b/.zuul.yaml
index 011c1ca9..82e97478 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -96,6 +96,7 @@
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
+      - openstack-python36-jobs
       - release-notes-jobs-python3
       - publish-openstack-docs-pti
       - check-requirements
diff --git a/kuryr_libnetwork/tests/fullstack/test_ipam.py b/kuryr_libnetwork/tests/fullstack/test_ipam.py
index c9ccc7f4..41686580 100644
--- a/kuryr_libnetwork/tests/fullstack/test_ipam.py
+++ b/kuryr_libnetwork/tests/fullstack/test_ipam.py
@@ -178,9 +178,9 @@ class IpamTest(kuryr_base.KuryrBaseTest):
             "Options": {},
             "Config": [
                 {
-                    "Subnet": "10.15.0.0/16",
-                    "IPRange": "10.15.0.0/24",
-                    "Gateway": "10.15.0.1"
+                    "Subnet": "10.13.0.0/16",
+                    "IPRange": "10.13.0.0/24",
+                    "Gateway": "10.13.0.1"
                 }
             ]
         }
diff --git a/kuryr_libnetwork/tests/unit/test_config.py b/kuryr_libnetwork/tests/unit/test_config.py
index 094c323a..ba4d4e42 100644
--- a/kuryr_libnetwork/tests/unit/test_config.py
+++ b/kuryr_libnetwork/tests/unit/test_config.py
@@ -47,16 +47,15 @@ class ConfigurationTest(base.TestKuryrBase):
         self.assertEqual('kuryr_libnetwork.port_driver.drivers.veth',
                          config.CONF.port_driver)
 
-    @mock.patch.object(sys, 'argv', return_value='[]')
     @mock.patch('kuryr_libnetwork.controllers.check_for_neutron_tag_support')
     @mock.patch('kuryr_libnetwork.controllers.check_for_neutron_ext_support')
     @mock.patch('kuryr_libnetwork.controllers.neutron_client')
     @mock.patch('kuryr_libnetwork.app.run')
     def test_start(self, mock_run, mock_neutron_client,
                    mock_check_neutron_ext_support,
-                   mock_check_for_neutron_tag_support,
-                   mock_sys_argv):
-        start()
+                   mock_check_for_neutron_tag_support):
+        with mock.patch.object(sys, 'argv', ['prog']):
+            start()
         kuryr_uri = parse.urlparse(config.CONF.kuryr_uri)
         mock_neutron_client.assert_called_once()
         mock_check_neutron_ext_support.assert_called_once()