diff --git a/controller/acceptance/pewpew.spec.ts b/controller/acceptance/pewpew.spec.ts
index 896df38b..fc9eb87e 100644
--- a/controller/acceptance/pewpew.spec.ts
+++ b/controller/acceptance/pewpew.spec.ts
@@ -208,8 +208,7 @@ describe("PewPew API Integration", () => {
   });
 
   describe("DELETE /pewpew", () => {
-    after(async () => {
-      // Put the version back
+    const uploadPewpew = async () => {
       try {
         const filename: string = path.basename(PEWPEW_ZIP_FILEPATH);
         const formData: FormDataPewPew = {
@@ -252,6 +251,18 @@ describe("PewPew API Integration", () => {
       } catch (error) {
         throw error;
       }
+    };
+
+    beforeEach(async () => {
+      if (uploadedPewPewVersion) {
+        return;
+      }
+      await uploadPewpew();
+    });
+
+    after(async () => {
+      // Put the version back
+      await uploadPewpew();
     });
 
     it("DELETE /pewpew should respond 200 OK", (done: Mocha.Done) => {
@@ -259,10 +270,11 @@ describe("PewPew API Integration", () => {
       const deleteVersion = uploadedPewPewVersion;
       const deleteURL = `${url}?version=${deleteVersion}`;
       log("DELETE URL", LogLevel.DEBUG, { deleteURL });
+      // Reset it since it's been deleted
+      uploadedPewPewVersion = undefined;
       fetch(deleteURL, { method: "DELETE" }).then((res: Response) => {
         log("DELETE /pewpew res", LogLevel.DEBUG, res);
         expect(res.status).to.equal(200);
-        uploadedPewPewVersion = undefined;
         const body: TestManagerError = res.data;
         log("body: " + res.data, LogLevel.DEBUG, body);
         expect(body).to.not.equal(undefined);
diff --git a/controller/integration/pewpew.spec.ts b/controller/integration/pewpew.spec.ts
index 4b158e7b..9fb52508 100644
--- a/controller/integration/pewpew.spec.ts
+++ b/controller/integration/pewpew.spec.ts
@@ -281,10 +281,7 @@ describe("PewPew Util Integration", () => {
   });
 
   describe("deletePewPew", () => {
-    beforeEach(async () => {
-      if (uploadedPewPewVersion) {
-        return;
-      }
+    const uploadPewpew = async () => {
       try {
         const parsedForm: ParsedForm = {
           fields: {},
@@ -317,6 +314,17 @@ describe("PewPew Util Integration", () => {
         log("deletePewPew beforeEach error", LogLevel.ERROR, error);
         throw error;
       }
+    };
+
+    beforeEach(async () => {
+      if (uploadedPewPewVersion) {
+        return;
+      }
+      await uploadPewpew();
+    });
+
+    after(async () => {
+      await uploadPewpew();
     });
 
     it("deletePewPew should respond 200 OK", (done: Mocha.Done) => {