diff --git a/tempest/skip-list-oc4.yaml b/tempest/skip-list-oc4.yaml
index 2db3db2..fef87e2 100644
--- a/tempest/skip-list-oc4.yaml
+++ b/tempest/skip-list-oc4.yaml
@@ -1,28 +1,15 @@
+heat_tempest_plugin.tests.functional.test_lbaasv2.LoadBalancerv2Test.test_create_update_loadbalancer[id-2f4a476c-cba7-448b-a7c1-85f7284f0293]: Wrong check for Contrail deployments. Will be verified manually.
 tempest.api.network.test_allowed_address_pair.AllowedAddressPairIpV6TestJSON.test_update_port_with_cidr_address_pair[id-4d6d178f-34f6-4bff-a01c-0a2f8fe909e4]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1514778.
 tempest.api.network.test_allowed_address_pair.AllowedAddressPairTestJSON.test_update_port_with_cidr_address_pair[id-4d6d178f-34f6-4bff-a01c-0a2f8fe909e4]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1514778.
-tempest.api.network.test_ports.PortsIpV6TestJSON.test_update_port_with_two_security_groups_and_extra_attributes[id-edf6766d-3d40-4621-bc6e-2521a44c257d]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
-tempest.api.network.test_ports.PortsTestJSON.test_update_port_with_two_security_groups_and_extra_attributes[id-edf6766d-3d40-4621-bc6e-2521a44c257d]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
-tempest.api.network.test_ports.PortsIpV6TestJSON.test_update_port_with_security_group_and_extra_attributes[id-58091b66-4ff4-4cc1-a549-05d60c7acd1a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
-tempest.api.network.test_ports.PortsTestJSON.test_update_port_with_security_group_and_extra_attributes[id-58091b66-4ff4-4cc1-a549-05d60c7acd1a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
 tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_two_subnets[id-4544adf7-bb5f-4bdc-b769-b3e77026cef2]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1596917.
-tempest.api.network.test_ports.PortsTestJSON.test_create_update_port_with_second_ip[id-63aeadd4-3b49-427f-a3b1-19ca81f06270]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604772.
-tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_port_with_second_ip[id-63aeadd4-3b49-427f-a3b1-19ca81f06270]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604772.
-tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_slaac_subnet_with_ports[id-88554555-ebf8-41ef-9300-4926d45e06e9]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654177
-tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_stateless_subnet_with_ports[id-2de6ab5a-fcf0-4144-9813-f91a940291f1]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654177
-tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_subnet_with_v6_attributes_slaac[id-176b030f-a923-4040-a755-9dc94329e60c]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654179.
-tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_subnet_with_v6_attributes_stateless[id-7d410310-8c86-4902-adf9-865d08e31adb]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654179.
-tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_subnet_with_v6_attributes_stateful[id-da40cd1b-a833-4354-9a85-cd9b8a3b74ca]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654179.
-tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_64_subnets[id-4256c61d-c538-41ea-9147-3c450c36669e]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604564.
-tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_stateless_no_ra[id-ae2f4a5d-03ff-4c42-a3b0-ce2fcb7ea832]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604564.
-tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_stateless_eui64[id-e5517e62-6f16-430d-a672-f80875493d4c]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604564.
-tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_invalid_options[id-81f18ef6-95b5-4584-9966-10d480b7496a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1514684.
-tempest.api.network.test_networks.NetworksTest.test_update_subnet_gw_dns_host_routes_dhcp[id-3d3852eb-3009-49ec-97ac-5ce83b73010a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1476951 and https://bugs.launchpad.net/juniperopenstack/+bug/1514684.
-tempest.api.network.test_networks.NetworksIpV6Test.test_update_subnet_gw_dns_host_routes_dhcp[id-3d3852eb-3009-49ec-97ac-5ce83b73010a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1476951 and https://bugs.launchpad.net/juniperopenstack/+bug/1514684.
-tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_list_agent[id-9c80f04d-11f3-44a4-8738-ed2f879b0ff4]: Agents are not in use in Contrail.
-tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_list_agents_non_admin[id-e335be47-b9a1-46fd-be30-0874c0b751e6]: Agents are not in use in Contrail.
-tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_show_agent[id-869bc8e8-0fda-4a30-9b71-f8a7cf58ca9f]: Agents are not in use in Contrail.
-tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_update_agent_description[id-68a94a14-1243-46e6-83bf-157627e31556]: Agents are not in use in Contrail.
-tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_update_agent_status[id-371dfc5b-55b9-4cb5-ac82-c40eadaac941]: Agents are not in use in Contrail.
+tempest.api.network.test_ports.PortsIpV6TestJSON.test_update_port_with_security_group_and_extra_attributes[id-58091b66-4ff4-4cc1-a549-05d60c7acd1a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
+tempest.api.network.test_ports.PortsIpV6TestJSON.test_update_port_with_two_security_groups_and_extra_attributes[id-edf6766d-3d40-4621-bc6e-2521a44c257d]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
+tempest.api.network.test_ports.PortsTestJSON.test_update_port_with_security_group_and_extra_attributes[id-58091b66-4ff4-4cc1-a549-05d60c7acd1a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
+tempest.api.network.test_ports.PortsTestJSON.test_update_port_with_two_security_groups_and_extra_attributes[id-edf6766d-3d40-4621-bc6e-2521a44c257d]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
+tempest.api.network.test_routers.RoutersIpV6Test.test_router_interface_port_update_with_fixed_ip[id-96522edf-b4b5-45d9-8443-fa11c26e6eff]: Contrail issue.
+tempest.api.network.test_routers.RoutersTest.test_router_interface_port_update_with_fixed_ip[id-96522edf-b4b5-45d9-8443-fa11c26e6eff]: Contrail issue.
+tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_port_security_macspoofing_port[compute,id-7c0bb1a2-d053-49a4-98f9-ca1a1d849f63,network,slow]: Contrail issue. See https://bugs.launchpad.net/juniperopenstack/+bug/1632961.
+heat_tempest_plugin.tests.functional.test_create_update_neutron_port.UpdatePortTest.test_update_remove_ip[id-8e37933b-345c-4ce5-a523-e67bdf198d73]: Contrail specific problem.
 heat_tempest_plugin.tests.functional.test_create_update_neutron_port.UpdatePortTest.test_update_with_mac_address[id-df1bf0fb-115e-42f3-b6cc-e12b5d506c98]: Contrail specific problem. Mac address cannot be changed for existing port.
 heat_tempest_plugin.tests.functional.test_create_update_neutron_subnet.UpdateSubnetTest.test_update_allocation_pools[id-af43fc6d-58ba-4b5f-bd68-07b29f0a96bc]: Contrail limitation.
 heat_tempest_plugin.tests.functional.test_create_update_neutron_subnet.UpdateSubnetTest.test_update_allocation_pools_to_empty[id-2f1d3b04-2183-4e50-8aa3-fa0fbff5c861]: Contrail limitation.
@@ -30,3 +17,37 @@
 heat_tempest_plugin.tests.functional.test_create_update_neutron_subnet.UpdateSubnetTest.test_update_gateway_ip_to_empty[id-e7b37a6b-e883-4c0c-b6a3-9ece1843e902]: Contrail limitation.
 heat_tempest_plugin.tests.functional.test_create_update_neutron_subnet.UpdateSubnetTest.test_update_to_no_allocation_pools[id-6ec51150-6f83-4179-9faa-a3aee91ea150]: Contrail limitation.
 heat_tempest_plugin.tests.functional.test_create_update_neutron_subnet.UpdateSubnetTest.test_update_to_no_gateway_ip[id-373bab03-1f66-4883-b1de-2ecc39efe17e]: Contrail limitation.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_list_agent[id-9c80f04d-11f3-44a4-8738-ed2f879b0ff4]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_list_agents_non_admin[id-e335be47-b9a1-46fd-be30-0874c0b751e6]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_show_agent[id-869bc8e8-0fda-4a30-9b71-f8a7cf58ca9f]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_update_agent_description[id-68a94a14-1243-46e6-83bf-157627e31556]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_update_agent_status[id-371dfc5b-55b9-4cb5-ac82-c40eadaac941]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_routers.RoutersAdminTest.test_update_router_set_gateway[id-6cc285d8-46bf-4f36-9b1a-783e3008ba79]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/r3.1/+bug/1604929.
+tempest.api.network.admin.test_routers.RoutersIpV6AdminTest.test_update_router_set_gateway[id-6cc285d8-46bf-4f36-9b1a-783e3008ba79]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/r3.1/+bug/1604929.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_64_subnets[id-4256c61d-c538-41ea-9147-3c450c36669e]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604564.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_invalid_options[id-81f18ef6-95b5-4584-9966-10d480b7496a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1514684.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_stateless_eui64[id-e5517e62-6f16-430d-a672-f80875493d4c]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604564.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_stateless_no_ra[id-ae2f4a5d-03ff-4c42-a3b0-ce2fcb7ea832]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604564.
+tempest.api.network.test_floating_ips_negative.FloatingIPNegativeTestJSON.test_associate_floatingip_port_ext_net_unreachable[id-6b3b8797-6d43-4191-985c-c48b773eb429,negative]: Contrail specific problem. https://bugs.launchpad.net/juniperopenstack/+bug/1476935.
+tempest.api.network.test_floating_ips_negative.FloatingIPNegativeTestJSON.test_create_floatingip_with_port_ext_net_unreachable[id-22996ea8-4a81-4b27-b6e1-fa5df92fa5e8,negative]: Contrail specific problem. https://bugs.launchpad.net/juniperopenstack/+bug/1476935.
+tempest.api.network.test_networks.NetworksTest.test_external_network_visibility[id-af774677-42a9-4e4b-bb58-16fe6a5bc1ec,smoke]: some problem with Neutron. See https://bugs.launchpad.net/neutron/+bug/1553595. Should be verified manually
+tempest.api.network.test_networks.NetworksIpV6Test.test_external_network_visibility[id-af774677-42a9-4e4b-bb58-16fe6a5bc1ec,smoke]: some problem with Neutron. See https://bugs.launchpad.net/neutron/+bug/1553595. Should be verified manually
+tempest.api.network.test_networks.NetworksIpV6Test.test_update_subnet_gw_dns_host_routes_dhcp[id-3d3852eb-3009-49ec-97ac-5ce83b73010a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1476951 and https://bugs.launchpad.net/juniperopenstack/+bug/1514684.
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_slaac_subnet_with_ports[id-88554555-ebf8-41ef-9300-4926d45e06e9]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654177
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_stateless_subnet_with_ports[id-2de6ab5a-fcf0-4144-9813-f91a940291f1]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654177
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_subnet_with_v6_attributes_slaac[id-176b030f-a923-4040-a755-9dc94329e60c]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654179.
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_subnet_with_v6_attributes_stateful[id-da40cd1b-a833-4354-9a85-cd9b8a3b74ca]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654179.
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_subnet_with_v6_attributes_stateless[id-7d410310-8c86-4902-adf9-865d08e31adb]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654179.
+tempest.api.network.test_networks.NetworksTest.test_update_subnet_gw_dns_host_routes_dhcp[id-3d3852eb-3009-49ec-97ac-5ce83b73010a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1476951 and https://bugs.launchpad.net/juniperopenstack/+bug/1514684.
+tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_port_with_second_ip[id-63aeadd4-3b49-427f-a3b1-19ca81f06270]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604772.
+tempest.api.network.test_ports.PortsTestJSON.test_create_update_port_with_second_ip[id-63aeadd4-3b49-427f-a3b1-19ca81f06270]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604772.
+tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops[compute,id-f323b3ba-82f8-4db7-8ea6-6a895869ec49,network,smoke]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1330903.
+tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_router_admin_state[compute,id-04b9fe4e-85e8-4aea-b937-ea93885ac59f,network,slow]: https://bugs.launchpad.net/juniperopenstack/+bug/1352822.
+tempest.scenario.test_network_v6.TestGettingAddress.test_dhcp6_stateless_from_os[compute,id-d7e1f858-187c-45a6-89c9-bdafde619a9f,network,slow]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604568
+tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_dhcp6_stateless_from_os[compute,id-76f26acd-9688-42b4-bc3e-cd134c4cb09e,network,slow]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604568.
+tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_dhcpv6_stateless[compute,id-cf1c4425-766b-45b8-be35-e2959728eb00,network,slow]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604568.
+tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_slaac[compute,id-9178ad42-10e4-47e9-8987-e02b170cc5cd,network]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604568.
+tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_slaac_from_os[compute,id-b6399d76-4438-4658-bcf5-0d6c8584fde2,network,slow]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604568.
+tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_dhcpv6_stateless[compute,id-7ab23f41-833b-4a16-a7c9-5b42fe6d4123,network,slow]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604568.
+tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_slaac[compute,id-dec222b1-180c-4098-b8c5-cc1b8342d611,network,slow]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604568.
+tempest.scenario.test_network_v6.TestGettingAddress.test_slaac_from_os[compute,id-2c92df61-29f0-4eaa-bee3-7c65bef62a43,network,slow]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604568.