diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py
index 63f57eb74..82516277e 100644
--- a/shade/openstackcloud.py
+++ b/shade/openstackcloud.py
@@ -4048,9 +4048,9 @@ class OpenStackCloud(_normalize.Normalizer):
                 floating_network_id = self._get_floating_network_id()
 
             filters = {
-                'port_id': None,
-                'floating_network_id': floating_network_id,
-                'tenant_id': project_id
+                'port': None,
+                'network': floating_network_id,
+                'location': {'project': {'id': project_id}},
             }
 
             floating_ips = self._list_floating_ips()
diff --git a/shade/tests/unit/test_floating_ip_neutron.py b/shade/tests/unit/test_floating_ip_neutron.py
index 041076e85..f953c9345 100644
--- a/shade/tests/unit/test_floating_ip_neutron.py
+++ b/shade/tests/unit/test_floating_ip_neutron.py
@@ -328,9 +328,9 @@ class TestFloatingIP(base.TestCase):
         mock__neutron_list_fips.assert_called_once_with(None)
         mock__filter_list.assert_called_once_with(
             [], name_or_id=None,
-            filters={'port_id': None,
-                     'floating_network_id': self.mock_get_network_rep['id'],
-                     'tenant_id': 'proj-id'}
+            filters={'port': None,
+                     'network': self.mock_get_network_rep['id'],
+                     'location': {'project': {'id': 'proj-id'}}}
         )
         mock__neutron_create_fip.assert_called_once_with(
             network_id=self.mock_get_network_rep['id'],
@@ -366,9 +366,9 @@ class TestFloatingIP(base.TestCase):
         mock__neutron_list_fips.assert_called_once_with(None)
         mock__filter_list.assert_called_once_with(
             [], name_or_id=None,
-            filters={'port_id': None,
-                     'floating_network_id': self.mock_get_network_rep['id'],
-                     'tenant_id': 'proj-id'}
+            filters={'port': None,
+                     'network': self.mock_get_network_rep['id'],
+                     'location': {'project': {'id': 'proj-id'}}}
         )
         mock__neutron_create_fip.assert_called_once_with(
             network_id=self.mock_get_network_rep['id'],