diff --git a/api_test.go b/api_test.go
index cb8ec38..8ed074c 100644
--- a/api_test.go
+++ b/api_test.go
@@ -14,11 +14,6 @@
 
 var _ = Describe("api", func() {
 
-	BeforeEach(func() {
-		_, err := getDB().Exec("DELETE FROM deployments")
-		Expect(err).ShouldNot(HaveOccurred())
-	})
-
 	Context("GET /deployments", func() {
 
 		It("should get an empty array if no deployments", func() {
diff --git a/apidGatewayDeploy_suite_test.go b/apidGatewayDeploy_suite_test.go
index 3ce174c..a4ff0e2 100644
--- a/apidGatewayDeploy_suite_test.go
+++ b/apidGatewayDeploy_suite_test.go
@@ -64,6 +64,12 @@
 	os.RemoveAll(tmpDir)
 })
 
+var _ = BeforeEach(func() {
+	_, err := getDB().Exec("DELETE FROM deployments")
+	Expect(err).ShouldNot(HaveOccurred())
+	_, err = getDB().Exec("UPDATE etag SET value=1")
+})
+
 func TestApidGatewayDeploy(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "ApidGatewayDeploy Suite")
diff --git a/listener_test.go b/listener_test.go
index ec4b7f2..1b52f7f 100644
--- a/listener_test.go
+++ b/listener_test.go
@@ -11,11 +11,6 @@
 
 var _ = Describe("listener", func() {
 
-	BeforeEach(func() {
-		_, err := getDB().Exec("DELETE FROM deployments")
-		Expect(err).ShouldNot(HaveOccurred())
-	})
-
 	Context("ApigeeSync snapshot event", func() {
 
 		It("should set DB and process", func(done Done) {