diff --git a/tools/clean-fips.py b/tools/clean-fips.py
new file mode 100755
index 0000000000..0c016d618a
--- /dev/null
+++ b/tools/clean-fips.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# Copyright (c) 2016 IBM Corp.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import shade
+
+for cloud in ('osic-cloud1', 'bluebox-sjc1'):
+    cloud = shade.openstack_cloud(cloud=cloud)
+    cleaned = [cloud.delete_floating_ip(ip.id) for ip in
+               cloud.list_floating_ips() if ip.attached is False]
+    print("Cleaned {num} FIPs from {cloud}".format(
+        num=len(cleaned), cloud=cloud.name))