diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java
new file mode 100644
index 000000000..ff18c21a5
--- /dev/null
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java
@@ -0,0 +1,127 @@
+/*
+ * This file is part of dependency-check-core.
+ *
+ * Dependency-check-core is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * Dependency-check-core is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * dependency-check-core. If not, see http://www.gnu.org/licenses/.
+ *
+ * Copyright (c) 2014 Jeremy Long. All Rights Reserved.
+ */
+package org.owasp.dependencycheck.data.nvdcve;
+
+import java.io.File;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author Jeremy Long (jeremy.long@owasp.org)
+ */
+public class DriverLoaderTest {
+
+    public DriverLoaderTest() {
+    }
+
+    @BeforeClass
+    public static void setUpClass() {
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+    }
+
+    @Before
+    public void setUp() {
+    }
+
+    @After
+    public void tearDown() {
+    }
+
+    /**
+     * Test of load method, of class DriverLoader.
+     */
+    @Test
+    public void testLoad_String() throws Exception {
+        String className = "org.h2.Driver";
+        DriverLoader.load(className);
+    }
+
+    /**
+     * Test of load method, of class DriverLoader; expecting an exception due to
+     * a bad driver class name.
+     */
+    @Test(expected = DriverLoadException.class)
+    public void testLoad_String_ex() throws Exception {
+        String className = "bad.Driver";
+        DriverLoader.load(className);
+    }
+
+    /**
+     * Test of load method, of class DriverLoader.
+     */
+    @Test
+    public void testLoad_String_String() throws Exception {
+        String className = "com.mysql.jdbc.Driver";
+        //we know this is in target/test-classes
+        File testClassPath = (new File(this.getClass().getClassLoader().getResource("org.mortbay.jetty.jar").getPath())).getParentFile();
+        File driver = new File(testClassPath, "../../src/test/resources/mysql-connector-java-5.1.27-bin.jar");
+        assertTrue("MySQL Driver JAR file not found in src/test/resources?", driver.isFile());
+
+        DriverLoader.load(className, driver.getAbsolutePath());
+    }
+
+    /**
+     * Test of load method, of class DriverLoader.
+     */
+    @Test
+    public void testLoad_String_String_multiple_paths() throws Exception {
+        final String className = "com.mysql.jdbc.Driver";
+        //we know this is in target/test-classes
+        final File testClassPath = (new File(this.getClass().getClassLoader().getResource("org.mortbay.jetty.jar").getPath())).getParentFile();
+        final File dir1 = new File(testClassPath, "../../src/test/");
+        final File dir2 = new File(testClassPath, "../../src/test/resources/");
+        final String paths = String.format("%s;%s", dir1.getAbsolutePath(), dir2.getAbsolutePath());
+
+        DriverLoader.load(className, paths);
+    }
+
+    /**
+     * Test of load method, of class DriverLoader with an incorrect class name.
+     */
+    @Test(expected = DriverLoadException.class)
+    public void testLoad_String_String_badClassName() throws Exception {
+        String className = "com.mybad.jdbc.Driver";
+        //we know this is in target/test-classes
+        File testClassPath = (new File(this.getClass().getClassLoader().getResource("org.mortbay.jetty.jar").getPath())).getParentFile();
+        File driver = new File(testClassPath, "../../src/test/resources/mysql-connector-java-5.1.27-bin.jar");
+        assertTrue("MySQL Driver JAR file not found in src/test/resources?", driver.isFile());
+
+        DriverLoader.load(className, driver.getAbsolutePath());
+    }
+
+    /**
+     * Test of load method, of class DriverLoader with an incorrect class path.
+     */
+    @Test(expected = DriverLoadException.class)
+    public void testLoad_String_String_badPath() throws Exception {
+        String className = "com.mysql.jdbc.Driver";
+        //we know this is in target/test-classes
+        File testClassPath = (new File(this.getClass().getClassLoader().getResource("org.mortbay.jetty.jar").getPath())).getParentFile();
+        File driver = new File(testClassPath, "../../src/test/bad/mysql-connector-java-5.1.27-bin.jar");
+        DriverLoader.load(className, driver.getAbsolutePath());
+    }
+}