diff --git a/bucket-policy.go b/bucket-policy.go
index d9186878b..6a7376e1d 100644
--- a/bucket-policy.go
+++ b/bucket-policy.go
@@ -101,6 +101,9 @@ func removeBucketPolicy(bucket string) error {
 		}
 		return err
 	}
+	if err := os.Remove(bucketPolicyFile); err != nil {
+		return err
+	}
 	return nil
 }
 
diff --git a/server_test.go b/server_test.go
index 587352a87..4f58bdbd0 100644
--- a/server_test.go
+++ b/server_test.go
@@ -350,6 +350,15 @@ func (s *MyAPISuite) TestBucketPolicy(c *C) {
 	response, err = client.Do(request)
 	c.Assert(err, IsNil)
 	c.Assert(response.StatusCode, Equals, http.StatusNoContent)
+
+	// Verify if the policy was indeed deleted.
+	request, err = s.newRequest("GET", testAPIFSCacheServer.URL+"/policybucket?policy", 0, nil)
+	c.Assert(err, IsNil)
+
+	client = http.Client{}
+	response, err = client.Do(request)
+	c.Assert(err, IsNil)
+	c.Assert(response.StatusCode, Equals, http.StatusNotFound)
 }
 
 func (s *MyAPISuite) TestDeleteBucket(c *C) {