diff --git a/java/google/registry/flows/async/DeleteEppResourceAction.java b/java/google/registry/flows/async/DeleteEppResourceAction.java
index 737746caa..2062c24df 100644
--- a/java/google/registry/flows/async/DeleteEppResourceAction.java
+++ b/java/google/registry/flows/async/DeleteEppResourceAction.java
@@ -49,8 +49,6 @@ import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.util.Clock;
 import google.registry.util.FormattingLogger;
-import google.registry.util.NonFinalForTesting;
-import google.registry.util.SystemClock;
 import google.registry.util.TypeUtils.TypeInstantiator;
 
 import org.joda.time.DateTime;
@@ -63,9 +61,6 @@ import javax.inject.Inject;
  */
 public abstract class DeleteEppResourceAction<T extends EppResource> implements MapreduceAction {
 
-  @NonFinalForTesting
-  static Clock clock = new SystemClock();
-
   /** The HTTP parameter name used to specify the websafe key of the resource to delete. */
   public static final String PARAM_RESOURCE_KEY = "resourceKey";
   public static final String PARAM_REQUESTING_CLIENT_ID = "requestingClientId";
@@ -76,6 +71,7 @@ public abstract class DeleteEppResourceAction<T extends EppResource> implements
   @Inject @Parameter(PARAM_RESOURCE_KEY) String resourceKeyString;
   @Inject @Parameter(PARAM_REQUESTING_CLIENT_ID) String requestingClientId;
   @Inject @Parameter(PARAM_IS_SUPERUSER) boolean isSuperuser;
+  @Inject Clock clock;
   @Inject MapreduceRunner mrRunner;
   @Inject Response response;
 
diff --git a/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java b/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java
index 71f1c1f03..6a0de8984 100644
--- a/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java
+++ b/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java
@@ -76,8 +76,8 @@ public abstract class DeleteEppResourceActionTestCase<T extends DeleteEppResourc
     action = deleteEppResourceAction;
     action.mrRunner = new MapreduceRunner(Optional.<Integer>absent(), Optional.<Integer>absent());
     action.response = new FakeResponse();
+    action.clock = clock;
     inject.setStaticField(Ofy.class, "clock", clock);
-    inject.setStaticField(DeleteEppResourceAction.class, "clock", clock);
 
     createTld("tld");
     contactUsed = persistActiveContact("blah1234");