diff --git a/debian/changelog b/debian/changelog
index b1da677..5cf3cf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ openstack-meta-packages (0.15) UNRELEASED; urgency=medium
 
   [ Ondřej Nový ]
   * Fixed VCS URLs (https).
+  * Fixed tempest.api.object_storage.test_crossdomain.CrossdomainTest
+    .test_get_crossdomain_policy
 
  -- Thomas Goirand <zigo@debian.org>  Fri, 29 Jan 2016 11:48:15 +0800
 
diff --git a/saio/swift/proxy-server.conf b/saio/swift/proxy-server.conf
index dea97d0..49042bb 100644
--- a/saio/swift/proxy-server.conf
+++ b/saio/swift/proxy-server.conf
@@ -84,7 +84,7 @@ eventlet_debug = true
 # The following pipeline shows keystone integration. Comment out the one
 # above and uncomment this one. Additional steps for integrating keystone are
 # covered further below in the filter sections for authtoken and keystoneauth.
-pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit formpost authtoken keystoneauth staticweb container-quotas account-quotas slo dlo versioned_writes proxy-logging proxy-server
+pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit formpost crossdomain authtoken keystoneauth staticweb container-quotas account-quotas slo dlo versioned_writes proxy-logging proxy-server
 
 [app:proxy-server]
 use = egg:swift#proxy
@@ -557,6 +557,10 @@ use = egg:swift#tempurl
 [filter:formpost]
 use = egg:swift#formpost
 
+[filter:crossdomain]
+use = egg:swift#crossdomain
+cross_domain_policy = <allow-access-from domain="*" />
+
 # Note: Just needs to be placed before the proxy-server in the pipeline.
 [filter:name_check]
 use = egg:swift#name_check
diff --git a/src/tempest_exclude.conf b/src/tempest_exclude.conf
index 9491d32..ca3dc49 100644
--- a/src/tempest_exclude.conf
+++ b/src/tempest_exclude.conf
@@ -22,7 +22,6 @@ tempest.api.compute.floating_ips.test_floating_ips_actions.FloatingIPsTestJSON
 tempest.api.compute.floating_ips.test_list_floating_ips.FloatingIPDetailsTestJSON
 
 tempest.api.object_storage.test_container_sync_middleware.ContainerSyncMiddlewareTest.test_container_synchronization
-tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy
 
 tempest.api.orchestration.stacks.test_nova_keypair_resources.NovaKeyPairResourcesYAMLTest