diff --git a/test/com/google/enterprise/adaptor/database/DatabaseAdaptorTest.java b/test/com/google/enterprise/adaptor/database/DatabaseAdaptorTest.java
index d297e84..443aed5 100644
--- a/test/com/google/enterprise/adaptor/database/DatabaseAdaptorTest.java
+++ b/test/com/google/enterprise/adaptor/database/DatabaseAdaptorTest.java
@@ -51,6 +51,7 @@
 import com.google.enterprise.adaptor.AuthzStatus;
 import com.google.enterprise.adaptor.Config;
 import com.google.enterprise.adaptor.DocId;
+import com.google.enterprise.adaptor.DocRequest;
 import com.google.enterprise.adaptor.GroupPrincipal;
 import com.google.enterprise.adaptor.InvalidConfigurationException;
 import com.google.enterprise.adaptor.Metadata;
@@ -2160,7 +2161,7 @@ public void testGetDocContent() throws Exception {
     configEntries.put("db.metadataColumns", "ID:col1, NAME:col2");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
-    MockRequest request = new MockRequest(new DocId("1001"));
+    DocRequest request = new DocRequest(new DocId("1001"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
 
@@ -2184,7 +2185,7 @@ public void testGetDocContent_noUniqueKeyFieldsInSelect() throws Exception {
     configEntries.put("db.modeOfOperation.contentColumn.columnName", "content");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
-    MockRequest request = new MockRequest(new DocId("1"));
+    DocRequest request = new DocRequest(new DocId("1"));
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     RecordingResponse response = new RecordingResponse(baos);
     adaptor.getDocContent(request, response);
@@ -2206,7 +2207,7 @@ public void testGetDocContent_wrongParameterColumnInQuery() throws Exception {
     configEntries.put("db.metadataColumns", "id:id, notId:notId");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
-    MockRequest request = new MockRequest(new DocId("1"));
+    DocRequest request = new DocRequest(new DocId("1"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
 
@@ -2235,7 +2236,7 @@ public void testGetDocContent_modeOfOperationConfig() throws Exception {
     configEntries.put("db.modeOfOperation.contentColumn.displayUrlCol", "url");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
-    MockRequest request = new MockRequest(new DocId("1"));
+    DocRequest request = new DocRequest(new DocId("1"));
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     RecordingResponse response = new RecordingResponse(baos);
     adaptor.getDocContent(request, response);
@@ -2257,7 +2258,7 @@ public void testGetDocContent_lister() throws Exception {
     moreEntries.put("db.everyDocIdSql", "select * from data");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(moreEntries);
-    MockRequest request = new MockRequest(new DocId("http://"));
+    DocRequest request = new DocRequest(new DocId("http://"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
     assertEquals(RecordingResponse.State.NOT_FOUND, response.getState());
@@ -2276,7 +2277,7 @@ public void testGetDocContent_noResults() throws Exception {
     configEntries.put("db.modeOfOperation", "rowToText");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
-    MockRequest request = new MockRequest(new DocId("1002"));
+    DocRequest request = new DocRequest(new DocId("1002"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
     assertEquals(RecordingResponse.State.NOT_FOUND, response.getState());
@@ -2299,7 +2300,7 @@ public void testGetDocContent_sqlException() throws Exception {
 
     executeUpdate("drop table data");
 
-    MockRequest request = new MockRequest(new DocId("1002"));
+    DocRequest request = new DocRequest(new DocId("1002"));
     RecordingResponse response = new RecordingResponse();
     thrown.expect(IOException.class);
     thrown.expectMessage("retrieval error");
@@ -2340,7 +2341,7 @@ private void testMetadataColumns(int sqlType, String sqlTypeDecl,
     configEntries.put("db.metadataColumns", "ID:col1, CONTENT:col2");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
-    MockRequest request = new MockRequest(new DocId("1"));
+    DocRequest request = new DocRequest(new DocId("1"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
 
@@ -2377,7 +2378,7 @@ public void testMetadataColumns_date() throws Exception {
     moreEntries.put("db.metadataColumns", "ID:col1, COL:col2");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(moreEntries);
-    MockRequest request = new MockRequest(new DocId("1001"));
+    DocRequest request = new DocRequest(new DocId("1001"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
 
@@ -2407,7 +2408,7 @@ public void testMetadataColumns_time() throws Exception {
     moreEntries.put("db.metadataColumns", "ID:col1, COL:col2");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(moreEntries);
-    MockRequest request = new MockRequest(new DocId("1001"));
+    DocRequest request = new DocRequest(new DocId("1001"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
 
@@ -2438,7 +2439,7 @@ public void testMetadataColumns_timestamp() throws Exception {
     moreEntries.put("db.metadataColumns", "ID:col1, COL:col2");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(moreEntries);
-    MockRequest request = new MockRequest(new DocId("1001"));
+    DocRequest request = new DocRequest(new DocId("1001"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
 
@@ -2500,7 +2501,7 @@ public void testMetadataColumns_sqlxml() throws Exception {
     configEntries.put("db.metadataColumns", "ID:col1, CONTENT:col2");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
-    MockRequest request = new MockRequest(new DocId("1"));
+    DocRequest request = new DocRequest(new DocId("1"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
 
@@ -2558,7 +2559,7 @@ public void testMetadataColumns_array() throws Exception {
     captureLogMessages(DatabaseAdaptor.class,
         "Metadata column type not supported", messages);
     DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
-    MockRequest request = new MockRequest(new DocId("1"));
+    DocRequest request = new DocRequest(new DocId("1"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
 
@@ -2594,7 +2595,7 @@ public void testMetadataColumns_arrayNull() throws Exception {
     captureLogMessages(DatabaseAdaptor.class,
         "Metadata column type not supported", messages);
     DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
-    MockRequest request = new MockRequest(new DocId("1"));
+    DocRequest request = new DocRequest(new DocId("1"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
 
@@ -2633,7 +2634,7 @@ public void testMetadataColumns_columnAlias() throws Exception {
     configEntries.put("db.metadataColumns", "id, quote");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
-    MockRequest request = new MockRequest(new DocId("6"));
+    DocRequest request = new DocRequest(new DocId("6"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
 
@@ -2674,7 +2675,7 @@ public void testGetDocContentAcl() throws Exception {
     moreEntries.put("db.modeOfOperation", "rowToText");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(moreEntries);
-    MockRequest request = new MockRequest(new DocId("1001"));
+    DocRequest request = new DocRequest(new DocId("1001"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
 
@@ -2700,7 +2701,7 @@ public void testGetDocContentAcl_empty() throws Exception {
     moreEntries.put("db.modeOfOperation", "rowToText");
 
     DatabaseAdaptor adaptor = getObjectUnderTest(moreEntries);
-    MockRequest request = new MockRequest(new DocId("1001"));
+    DocRequest request = new DocRequest(new DocId("1001"));
     RecordingResponse response = new RecordingResponse();
     adaptor.getDocContent(request, response);
 
@@ -2727,7 +2728,7 @@ public void testGetDocContentAcl_sqlException() throws Exception {
 
     executeUpdate("drop table acl");
 
-    MockRequest request = new MockRequest(new DocId("1001"));
+    DocRequest request = new DocRequest(new DocId("1001"));
     RecordingResponse response = new RecordingResponse();
     thrown.expect(IOException.class);
     thrown.expectMessage("retrieval error");
diff --git a/test/com/google/enterprise/adaptor/database/MockRequest.java b/test/com/google/enterprise/adaptor/database/MockRequest.java
deleted file mode 100644
index 947afee..0000000
--- a/test/com/google/enterprise/adaptor/database/MockRequest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2014 Google Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.enterprise.adaptor.database;
-
-import com.google.enterprise.adaptor.DocId;
-import com.google.enterprise.adaptor.Request;
-
-import java.util.Date;
-
-/** A trivial implemenation of {@link Request} */
-// Copied from the Filesystem Adaptor
-class MockRequest implements Request {
-  private final DocId docid;
-  private final Date lastAccess;
-
-  MockRequest(DocId docid) {
-    this(docid, null);
-  }
-
-  MockRequest(DocId docid, Date lastAccess) {
-    this.docid = docid;
-    this.lastAccess = lastAccess;
-  }
-
-  @Override
-  public boolean hasChangedSinceLastAccess(Date lastModified) {
-    return (lastAccess == null || lastModified == null) ? true
-        : lastModified.after(lastAccess);
-  }
-
-  @Override
-  public Date getLastAccessTime() {
-    return lastAccess;
-  }
-
-  @Override
-  public DocId getDocId() {
-    return docid;
-  }
-
-  @Override
-  public boolean canRespondWithNoContent(Date lastModified) {
-    return !hasChangedSinceLastAccess(lastModified);
-  }
-}