diff --git a/functional-test/pom.xml b/functional-test/pom.xml
index d267e1abfa..16203fe721 100644
--- a/functional-test/pom.xml
+++ b/functional-test/pom.xml
@@ -154,6 +154,11 @@
             <scope>${hibernate.scope}</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+
     </dependencies>
 
     <profiles>
diff --git a/functional-test/src/test/java/org/zanata/feature/ManualRunHelper.java b/functional-test/src/test/java/org/zanata/feature/ManualRunHelper.java
index 1db875eb01..e3166561d3 100644
--- a/functional-test/src/test/java/org/zanata/feature/ManualRunHelper.java
+++ b/functional-test/src/test/java/org/zanata/feature/ManualRunHelper.java
@@ -31,7 +31,7 @@ public class ManualRunHelper
 {
    private static final Pattern TAG_PATTERN = Pattern.compile("\\s*<.+>(.+)</.+>\\s*");
    private static String url;
-   private static String driver;
+   private static String driver = "org.h2.Driver";
    private static String username;
    private static String password = "";
    private static Connection connection;
@@ -82,6 +82,7 @@ private static void extractConnectionInfo() throws IOException
          {
             url = tagValue;
          }
+         // in as7 there is no longer a driver class tag
          if (line.contains("<driver-class>"))
          {
             driver = tagValue;
diff --git a/functional-test/src/test/resources/conf/zanata.properties b/functional-test/src/test/resources/conf/zanata.properties
index 3ccf571f3e..3fe32c9052 100644
--- a/functional-test/src/test/resources/conf/zanata.properties
+++ b/functional-test/src/test/resources/conf/zanata.properties
@@ -10,7 +10,7 @@
 # (Only one can be selected, excepted for internal and openid which
 # can be active simultaneously)
 # Valid key values: zanata.security.auth.policy.internal, .kerberos, .openid, .jaas
-zanata.security.auth.policy.internal = zanata
+zanata.security.auth.policy.internal = zanata.internal
 #zanata.security.auth.policy.openid = zanata.openid
 
 # Users that should be made administrators upon bootstrap or registration.
diff --git a/zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java b/zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
index 43660670f2..d810a0d4ea 100644
--- a/zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
+++ b/zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java b/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
index b8f8657f8c..e4f1d408a1 100644
--- a/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
+++ b/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
@@ -50,6 +50,10 @@ public void shutdownEM()
       log.debug("Shutting down EM");
       clearHibernateSecondLevelCache();
       em.getTransaction().rollback();
+      if (em.isOpen())
+      {
+         em.close();
+      }
       em = null;
    }