diff --git a/core/src/com/google/zxing/MultiFormatReader.java b/core/src/com/google/zxing/MultiFormatReader.java
index 0409436ad..adab2f1d9 100644
--- a/core/src/com/google/zxing/MultiFormatReader.java
+++ b/core/src/com/google/zxing/MultiFormatReader.java
@@ -59,7 +59,8 @@ public final class MultiFormatReader implements Reader {
     if (readers.isEmpty()) {
       readers.addElement(new MultiFormatOneDReader());
       readers.addElement(new QRCodeReader());
-      readers.addElement(new DataMatrixReader());
+      // TODO re-enable once Data Matrix is ready
+      // readers.addElement(new DataMatrixReader());
     }
 
     for (int i = 0; i < readers.size(); i++) {
diff --git a/core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox1TestCase.java b/core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox1TestCase.java
index 471cb42d9..38204036e 100644
--- a/core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox1TestCase.java
+++ b/core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox1TestCase.java
@@ -28,6 +28,7 @@ import java.io.File;
 public final class DataMatrixBlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public DataMatrixBlackBox1TestCase() {
+    // TODO use MultiFormatReader here once Data Matrix decoder is done
     super(new File("test/data/blackbox/datamatrix-1"), new DataMatrixReader(), 1.0, BarcodeFormat.DATAMATRIX);
   }