diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java
index 30a1ebac52c9e9496e392ec102363832c50b5564..e8de544dc6ac11f21664b9fa060e85c124197fe4 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java
@@ -156,7 +156,7 @@ public class DatabaseConfigurationContext implements DisposableBean
     private final String getDriver() throws ConfigurationFailureException
     {
         checkDatabaseEngine();
-        return databaseEngine.getDriverClass().getCanonicalName();
+        return databaseEngine.getDriverClass();
     }
 
     /**
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseEngine.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseEngine.java
index 323b5e3fc05bf107218b5efe8570ce6e7b3431c9..7096e8e0bb927468fb6340c3c6251dc8127348a9 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseEngine.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseEngine.java
@@ -38,11 +38,11 @@ import ch.systemsx.cisd.dbmigration.postgresql.PostgreSQLDAOFactory;
  */
 public enum DatabaseEngine
 {
-    POSTGRESQL("postgresql", org.postgresql.Driver.class, PostgreSQLDAOFactory.class, new DefaultLobHandler(),
+    POSTGRESQL("postgresql", "org.postgresql.Driver", PostgreSQLDAOFactory.class, new DefaultLobHandler(),
             new PostgreSQLSequencerHandler(), "jdbc:postgresql:{0}", "jdbc:postgresql:{0}{1}", "//localhost/",
             "postgres"),
 
-    H2("h2", org.h2.Driver.class, H2DAOFactory.class, new DefaultLobHandler(),
+    H2("h2", "org.h2.Driver", H2DAOFactory.class, new DefaultLobHandler(),
             new PostgreSQLSequencerHandler(), "jdbc:h2:{0}{1};DB_CLOSE_DELAY=-1",
             "jdbc:h2:{0}{1};DB_CLOSE_DELAY=-1", "mem:", "");
 
@@ -50,7 +50,7 @@ public enum DatabaseEngine
 
     private final String code;
 
-    private final Class<java.sql.Driver> driverClass;
+    private final String driverClass;
 
     private final Class<ch.systemsx.cisd.dbmigration.IDAOFactory> daoFactoryClass;
 
@@ -69,7 +69,7 @@ public enum DatabaseEngine
     private final String defaultAdminUser;
 
     @SuppressWarnings("unchecked")
-    DatabaseEngine(String code, Class<?> driver, Class<?> daoFactoryClass, LobHandler lobHandler,
+    DatabaseEngine(String code, String driver, Class<?> daoFactoryClass, LobHandler lobHandler,
             ISequencerHandler sequenceHandler, String adminUrlTemplate, String urlTemplate, String defaultURLHostPart,
             String defaultAdminUser)
     {
@@ -88,7 +88,7 @@ public enum DatabaseEngine
         this.urlTemplate = urlTemplate;
         this.defaultURLHostPart = defaultURLHostPart;
         this.defaultAdminUser = defaultAdminUser;
-        this.driverClass = (Class<java.sql.Driver>) driver;
+        this.driverClass = driver;
         this.lobHandler = lobHandler;
         this.sequenceHandler = sequenceHandler;
         this.daoFactoryClass = (Class<ch.systemsx.cisd.dbmigration.IDAOFactory>) daoFactoryClass;
@@ -126,7 +126,7 @@ public enum DatabaseEngine
     /**
      * @return the class of the driver.
      */
-    public final Class<java.sql.Driver> getDriverClass()
+    public final String getDriverClass()
     {
         return driverClass;
     }