diff --git a/pom.xml b/pom.xml
index e9aa3f16..32002470 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,7 +248,9 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.8.2.2</version>
+      <version>${derby.version}</version>
+      <scope>runtime</scope>
+      <optional>true</optional>
     </dependency>
 
     <!-- In Android these libraries are incomplete,
@@ -267,6 +269,7 @@
     <easymock.version>3.0</easymock.version>
     <junit.version>4.8.2</junit.version>
     <slf4j.version>1.6.2</slf4j.version>
+    <derby.version>10.8.2.2</derby.version>
   </properties>
 
 </project>
diff --git a/tests/com/google/bitcoin/store/DerbyBlockStoreTest.java b/tests/com/google/bitcoin/store/DerbyBlockStoreTest.java
index c948b897..37c04c9d 100644
--- a/tests/com/google/bitcoin/store/DerbyBlockStoreTest.java
+++ b/tests/com/google/bitcoin/store/DerbyBlockStoreTest.java
@@ -68,7 +68,8 @@ public class DerbyBlockStoreTest {
             for (File c : f.listFiles())
                 deleteRecursively(c);
         }
-        if (!f.delete())
+        
+        if (f.exists() && !f.delete())
             throw new FileNotFoundException("Failed to delete file: " + f);
     }
 }