3 files changed, 7 insertions, 4 deletions
diff --git a/test/src/java/com/healthmarketscience/jackcess/DatabaseTest.java b/test/src/java/com/healthmarketscience/jackcess/DatabaseTest.java
index 52c7b60..26c35ff 100644
--- a/test/src/java/com/healthmarketscience/jackcess/DatabaseTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/DatabaseTest.java
@@ -997,11 +997,10 @@ public class DatabaseTest extends TestCase {
     for (final FileFormat fileFormat : SUPPORTED_FILEFORMATS) {
       Database db = create(fileFormat);
 
-      if (!FileFormat.V2003.equals(fileFormat)
-              && !FileFormat.V2007.equals(fileFormat)) {
+      if (fileFormat.ordinal() < FileFormat.V2003.ordinal()) {
         assertNotNull("file format: " + fileFormat, db.getSystemTable("MSysAccessObjects"));
       } else {
-        // v2003, v2007 template files have no "MSysAccessObjects" table
+        // v2003+ template files have no "MSysAccessObjects" table
         assertNull("file format: " + fileFormat, db.getSystemTable("MSysAccessObjects"));
       }
 
diff --git a/test/src/java/com/healthmarketscience/jackcess/IndexTest.java b/test/src/java/com/healthmarketscience/jackcess/IndexTest.java
index 5e67022..1e326c3 100644
--- a/test/src/java/com/healthmarketscience/jackcess/IndexTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/IndexTest.java
@@ -392,7 +392,8 @@ public class IndexTest extends TestCase {
 
       final Map<String,Object> row = c.getCurrentRow();
       // Row order is arbitrary, so v2007 row order difference is valid
-      if (Database.FileFormat.V2007.equals(testDB.getExpectedFileFormat())) {
+      if (testDB.getExpectedFileFormat().ordinal() >= 
+          Database.FileFormat.V2007.ordinal()) {
         DatabaseTest.checkTestDBTable1RowA(testDB, table, row);
       } else {
         DatabaseTest.checkTestDBTable1RowABCDEFG(testDB, table, row);
diff --git a/test/src/java/com/healthmarketscience/jackcess/UsageMapTest.java b/test/src/java/com/healthmarketscience/jackcess/UsageMapTest.java
index a2321d1..87fa5c3 100644
--- a/test/src/java/com/healthmarketscience/jackcess/UsageMapTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/UsageMapTest.java
@@ -28,6 +28,9 @@ public final class UsageMapTest extends TestCase {
             } else if (Database.FileFormat.V2007.equals(expectedFileFormat)) {
                 expectedFirstPage = 94;
                 expectedLastPage = 511;
+            } else if (Database.FileFormat.V2010.equals(expectedFileFormat)) {
+                expectedFirstPage = 109;
+                expectedLastPage = 511;
             } else {
                 throw new IllegalAccessException("Unknown file format: " + expectedFileFormat);
             }