diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeJarTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeJarTest.java
new file mode 100644
index 00000000..7e693d00
--- /dev/null
+++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeJarTest.java
@@ -0,0 +1,68 @@
+/**
+ *  Copyright 2011 Ryszard Wiśniewski <brut.alll@gmail.com>
+ *
+ *  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 brut.androlib;
+
+import brut.androlib.res.util.ExtFile;
+import brut.common.BrutException;
+import brut.util.OS;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.logging.Logger;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Connor Tumbleson <connor.tumbleson@gmail.com>
+ */
+public class BuildAndDecodeJarTest {
+
+    @BeforeClass
+    public static void beforeClass() throws Exception, BrutException {
+        sTmpDir = new ExtFile(OS.createTempDirectory());
+        sTestOrigDir = new ExtFile(sTmpDir, "testjar-orig");
+        sTestNewDir = new ExtFile(sTmpDir, "testjar-new");
+        LOGGER.info("Unpacking testjar...");
+        TestUtils.copyResourceDir(BuildAndDecodeJarTest.class, "brut/apktool/testjar/", sTestOrigDir);
+
+        LOGGER.info("Building testjar.apk...");
+        File testJar = new File(sTmpDir, "testjar.jar");
+        new Androlib().build(sTestOrigDir, testJar, TestUtils.returnStockHashMap(),"");
+
+        LOGGER.info("Decoding testjar.jar...");
+        ApkDecoder apkDecoder = new ApkDecoder(testJar);
+        apkDecoder.setOutDir(sTestNewDir);
+        apkDecoder.decode();
+    }
+
+    @AfterClass
+    public static void afterClass() throws BrutException {
+        OS.rmdir(sTmpDir);
+    }
+
+    @Test
+    public void buildAndDecodeTest() throws BrutException {
+        assertTrue(sTestNewDir.isDirectory());
+    }
+
+    private static ExtFile sTmpDir;
+    private static ExtFile sTestOrigDir;
+    private static ExtFile sTestNewDir;
+
+    private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeTest.class.getName());
+}
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/apktool.yml
new file mode 100644
index 00000000..92bc2cf6
--- /dev/null
+++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/apktool.yml
@@ -0,0 +1,2 @@
+version: 2.0.0
+apkFileName: testjar.jar
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/original/META-INF/MANIFEST.MF b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/original/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..3a012346
--- /dev/null
+++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/original/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Created-By: 1.6.0_45 (Sun Microsystems Inc.)
+
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/smali/com/apktool/test/Test.smali b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/smali/com/apktool/test/Test.smali
new file mode 100644
index 00000000..3da27da5
--- /dev/null
+++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/smali/com/apktool/test/Test.smali
@@ -0,0 +1,15 @@
+.class public LTest;
+
+.super Ljava/lang/Object;
+
+.method public static main([Ljava/lang/String;)V
+    .registers 2
+
+    sget-object v0, Ljava/lang/System;->out:Ljava/io/PrintStream;
+
+    const/high16 v1, 0x7f020000
+
+    invoke-virtual {v0, v1}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
+
+    return-void
+.end method