diff --git a/core/build.xml b/core/build.xml
index ef364defd..c3983e483 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -120,6 +120,9 @@
 
   <target name="test-blackbox" depends="build-test">
     <parallel failonany="true">
+      <antcall target="test-blackbox-subset">
+        <param name="subdir" value="aztec"/>
+      </antcall>
       <antcall target="test-blackbox-subset">
         <param name="subdir" value="datamatrix"/>
       </antcall>
@@ -150,7 +153,7 @@
       <assertions>
         <enable/>
       </assertions>
-      <jvmarg value="-Djava.awt.headless=true"/>      
+      <jvmarg value="-Djava.awt.headless=true"/>
       <batchtest>
         <fileset dir="test/src">
           <include name="**/${subdir}/*BlackBox*TestCase.java"/>
diff --git a/core/test/data/blackbox/aztec-2/01.png b/core/test/data/blackbox/aztec-2/01.png
new file mode 100755
index 000000000..90cccf988
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/01.png differ
diff --git a/core/test/data/blackbox/aztec-2/01.txt b/core/test/data/blackbox/aztec-2/01.txt
new file mode 100644
index 000000000..60a24c0f0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/01.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/02.png b/core/test/data/blackbox/aztec-2/02.png
new file mode 100755
index 000000000..cc2a11926
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/02.png differ
diff --git a/core/test/data/blackbox/aztec-2/02.txt b/core/test/data/blackbox/aztec-2/02.txt
new file mode 100644
index 000000000..60a24c0f0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/02.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/03.png b/core/test/data/blackbox/aztec-2/03.png
new file mode 100755
index 000000000..95415e0af
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/03.png differ
diff --git a/core/test/data/blackbox/aztec-2/03.txt b/core/test/data/blackbox/aztec-2/03.txt
new file mode 100644
index 000000000..60a24c0f0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/03.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/04.png b/core/test/data/blackbox/aztec-2/04.png
new file mode 100755
index 000000000..2cc2073b3
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/04.png differ
diff --git a/core/test/data/blackbox/aztec-2/04.txt b/core/test/data/blackbox/aztec-2/04.txt
new file mode 100644
index 000000000..60a24c0f0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/04.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/05.png b/core/test/data/blackbox/aztec-2/05.png
new file mode 100755
index 000000000..82f68d512
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/05.png differ
diff --git a/core/test/data/blackbox/aztec-2/05.txt b/core/test/data/blackbox/aztec-2/05.txt
new file mode 100644
index 000000000..60a24c0f0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/05.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/06.png b/core/test/data/blackbox/aztec-2/06.png
new file mode 100755
index 000000000..f53b2fc61
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/06.png differ
diff --git a/core/test/data/blackbox/aztec-2/06.txt b/core/test/data/blackbox/aztec-2/06.txt
new file mode 100644
index 000000000..60a24c0f0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/06.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/07.png b/core/test/data/blackbox/aztec-2/07.png
new file mode 100755
index 000000000..e8dfe933a
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/07.png differ
diff --git a/core/test/data/blackbox/aztec-2/07.txt b/core/test/data/blackbox/aztec-2/07.txt
new file mode 100644
index 000000000..60a24c0f0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/07.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/08.png b/core/test/data/blackbox/aztec-2/08.png
new file mode 100755
index 000000000..e089a32a6
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/08.png differ
diff --git a/core/test/data/blackbox/aztec-2/08.txt b/core/test/data/blackbox/aztec-2/08.txt
new file mode 100644
index 000000000..60a24c0f0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/08.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/09.png b/core/test/data/blackbox/aztec-2/09.png
new file mode 100755
index 000000000..086597daf
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/09.png differ
diff --git a/core/test/data/blackbox/aztec-2/09.txt b/core/test/data/blackbox/aztec-2/09.txt
new file mode 100644
index 000000000..30afa1714
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/09.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/10.png b/core/test/data/blackbox/aztec-2/10.png
new file mode 100755
index 000000000..67286b290
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/10.png differ
diff --git a/core/test/data/blackbox/aztec-2/10.txt b/core/test/data/blackbox/aztec-2/10.txt
new file mode 100644
index 000000000..30afa1714
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/10.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/11.png b/core/test/data/blackbox/aztec-2/11.png
new file mode 100755
index 000000000..dd0c6c3cd
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/11.png differ
diff --git a/core/test/data/blackbox/aztec-2/11.txt b/core/test/data/blackbox/aztec-2/11.txt
new file mode 100644
index 000000000..30afa1714
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/11.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/12.png b/core/test/data/blackbox/aztec-2/12.png
new file mode 100755
index 000000000..9e3ab55cd
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/12.png differ
diff --git a/core/test/data/blackbox/aztec-2/12.txt b/core/test/data/blackbox/aztec-2/12.txt
new file mode 100644
index 000000000..30afa1714
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/12.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/13.png b/core/test/data/blackbox/aztec-2/13.png
new file mode 100755
index 000000000..a6dc7eb46
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/13.png differ
diff --git a/core/test/data/blackbox/aztec-2/13.txt b/core/test/data/blackbox/aztec-2/13.txt
new file mode 100644
index 000000000..30afa1714
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/13.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/14.png b/core/test/data/blackbox/aztec-2/14.png
new file mode 100755
index 000000000..7c1b90aeb
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/14.png differ
diff --git a/core/test/data/blackbox/aztec-2/14.txt b/core/test/data/blackbox/aztec-2/14.txt
new file mode 100644
index 000000000..30afa1714
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/14.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/15.png b/core/test/data/blackbox/aztec-2/15.png
new file mode 100755
index 000000000..fcff11f78
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/15.png differ
diff --git a/core/test/data/blackbox/aztec-2/15.txt b/core/test/data/blackbox/aztec-2/15.txt
new file mode 100644
index 000000000..30afa1714
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/15.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/16.png b/core/test/data/blackbox/aztec-2/16.png
new file mode 100755
index 000000000..005a0cc25
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/16.png differ
diff --git a/core/test/data/blackbox/aztec-2/16.txt b/core/test/data/blackbox/aztec-2/16.txt
new file mode 100644
index 000000000..8399dfed4
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/16.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/17.png b/core/test/data/blackbox/aztec-2/17.png
new file mode 100755
index 000000000..e94e64caf
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/17.png differ
diff --git a/core/test/data/blackbox/aztec-2/17.txt b/core/test/data/blackbox/aztec-2/17.txt
new file mode 100644
index 000000000..8399dfed4
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/17.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/18.png b/core/test/data/blackbox/aztec-2/18.png
new file mode 100755
index 000000000..252e35878
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/18.png differ
diff --git a/core/test/data/blackbox/aztec-2/18.txt b/core/test/data/blackbox/aztec-2/18.txt
new file mode 100644
index 000000000..8399dfed4
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/18.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/19.png b/core/test/data/blackbox/aztec-2/19.png
new file mode 100755
index 000000000..499ae3b3d
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/19.png differ
diff --git a/core/test/data/blackbox/aztec-2/19.txt b/core/test/data/blackbox/aztec-2/19.txt
new file mode 100644
index 000000000..8399dfed4
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/19.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/20.png b/core/test/data/blackbox/aztec-2/20.png
new file mode 100755
index 000000000..747293125
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/20.png differ
diff --git a/core/test/data/blackbox/aztec-2/20.txt b/core/test/data/blackbox/aztec-2/20.txt
new file mode 100644
index 000000000..8399dfed4
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/20.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/21.png b/core/test/data/blackbox/aztec-2/21.png
new file mode 100755
index 000000000..831380949
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/21.png differ
diff --git a/core/test/data/blackbox/aztec-2/21.txt b/core/test/data/blackbox/aztec-2/21.txt
new file mode 100644
index 000000000..8399dfed4
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/21.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/22.png b/core/test/data/blackbox/aztec-2/22.png
new file mode 100755
index 000000000..3a6e9f152
Binary files /dev/null and b/core/test/data/blackbox/aztec-2/22.png differ
diff --git a/core/test/data/blackbox/aztec-2/22.txt b/core/test/data/blackbox/aztec-2/22.txt
new file mode 100644
index 000000000..8399dfed4
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/22.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/src/com/google/zxing/aztec/AztecBlackBox2TestCase.java b/core/test/src/com/google/zxing/aztec/AztecBlackBox2TestCase.java
index c4e98be49..fc1d9b92e 100644
--- a/core/test/src/com/google/zxing/aztec/AztecBlackBox2TestCase.java
+++ b/core/test/src/com/google/zxing/aztec/AztecBlackBox2TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ZXing authors
+ * Copyright 2011 ZXing authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,16 +20,18 @@ import com.google.zxing.BarcodeFormat;
 import com.google.zxing.common.AbstractBlackBoxTestCase;
 
 /**
- * @author David Olivier
+ * A test of Aztec barcodes under real world lighting conditions, taken with a mobile phone.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
  */
 public final class AztecBlackBox2TestCase extends AbstractBlackBoxTestCase {
 
   public AztecBlackBox2TestCase() {
     super("test/data/blackbox/aztec-2", new AztecReader(), BarcodeFormat.AZTEC);
-    addTest(1, 1, 0.0f);
-    addTest(1, 1, 90.0f);
-    addTest(1, 1, 180.0f);
+    addTest(2, 2, 0.0f);
+    addTest(2, 2, 90.0f);
+    addTest(3, 3, 180.0f);
     addTest(1, 1, 270.0f);
   }
 
-}
\ No newline at end of file
+}
diff --git a/core/test/src/com/google/zxing/negative/FalsePositives2BlackBoxTestCase.java b/core/test/src/com/google/zxing/negative/FalsePositives2BlackBoxTestCase.java
index 8d0486b06..159ad2c5e 100644
--- a/core/test/src/com/google/zxing/negative/FalsePositives2BlackBoxTestCase.java
+++ b/core/test/src/com/google/zxing/negative/FalsePositives2BlackBoxTestCase.java
@@ -27,10 +27,10 @@ public final class FalsePositives2BlackBoxTestCase extends AbstractNegativeBlack
 
   public FalsePositives2BlackBoxTestCase() {
     super("test/data/blackbox/falsepositives-2");
-    addTest(6, 0.0f);
-    addTest(6, 90.0f);
-    addTest(6, 180.0f);
-    addTest(6, 270.0f);
+    addTest(7, 0.0f);
+    addTest(7, 90.0f);
+    addTest(7, 180.0f);
+    addTest(7, 270.0f);
   }
 
 }