@@ -152,7 +152,7 @@ public void extractFileInto(File pdfFile, File outputFile) throws ParseException
     private void extractFile(File pdfFile, Appendable outFile) throws ParseException {
         PDDocument pdfDocument = null;
         try {
-            pdfDocument = PDDocument.load(pdfFile);
+            pdfDocument = this.password == null ? PDDocument.load(pdfFile) : PDDocument.load(pdfFile, this.password);
             PageIterator pageIterator = getPageIterator(pdfDocument);
             List<Table> tables = new ArrayList<Table>();
 
 
@@ -122,4 +122,27 @@ public void testGuessOption() throws ParseException, IOException {
         }));
     }
 
+    @Test
+    public void testEncryptedPasswordSupplied() throws ParseException {
+        String s = this.csvFromCommandLineArgs(new String[]{
+                "src/test/resources/technology/tabula/encrypted.pdf",
+                "-s", "userpassword",
+                "-p", "1",
+                "-f", "CSV"
+        });
+        assertEquals("FLA Audit Profile,,,,,,,,,", s.split("\\r?\\n")[0]);
+    }
+
+    @Test(expected=org.apache.commons.cli.ParseException.class)
+    public void testEncryptedWrongPassword() throws ParseException {
+        String s = this.csvFromCommandLineArgs(new String[]{
+                "src/test/resources/technology/tabula/encrypted.pdf",
+                "-s", "wrongpassword",
+                "-p", "1",
+                "-f", "CSV"
+        });
+    }
+
+
+
 }
@@ -39,19 +39,19 @@ public void testCanReadPDFWithOwnerEncryption() throws IOException {
         assertEquals(2, i);
     }
 
-    /*
+
     @Test
     public void testGoodPassword() throws IOException {
-        PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/encrypted.pdf"));
-        ObjectExtractor oe = new ObjectExtractor(pdf_document, "userpassword"); 
+        PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/encrypted.pdf"), "userpassword");
+        ObjectExtractor oe = new ObjectExtractor(pdf_document);
         List<Page> pages = new ArrayList<Page>();
         PageIterator pi = oe.extract();
         while (pi.hasNext()) {
             pages.add(pi.next());
         }
         assertEquals(1, pages.size());
     }
-    */
+
 
     @Test
     public void testTextExtractionDoesNotRaise() throws IOException {