diff --git a/database-commons/src/test/java/io/cdap/plugin/db/CommonSchemaReaderTest.java b/database-commons/src/test/java/io/cdap/plugin/db/CommonSchemaReaderTest.java
index 0f5a3ca4a..cbe1361d0 100644
--- a/database-commons/src/test/java/io/cdap/plugin/db/CommonSchemaReaderTest.java
+++ b/database-commons/src/test/java/io/cdap/plugin/db/CommonSchemaReaderTest.java
@@ -17,6 +17,7 @@
 package io.cdap.plugin.db;
 
 import io.cdap.cdap.api.data.schema.Schema;
+import io.cdap.cdap.api.exception.ProgramFailureException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -162,49 +163,49 @@ public void testGetSchemaThrowsExceptionOnNumericWithZeroPrecision() throws SQLE
     reader.getSchema(metadata, 1);
   }
 
-  @Test(expected = SQLException.class)
+  @Test(expected = ProgramFailureException.class)
   public void testGetSchemaThrowsExceptionOnArray() throws SQLException {
     when(metadata.getColumnType(eq(1))).thenReturn(Types.ARRAY);
     reader.getSchema(metadata, 1);
   }
 
-  @Test(expected = SQLException.class)
+  @Test(expected = ProgramFailureException.class)
   public void testGetSchemaThrowsExceptionOnDatalink() throws SQLException {
     when(metadata.getColumnType(eq(1))).thenReturn(Types.DATALINK);
     reader.getSchema(metadata, 1);
   }
 
-  @Test(expected = SQLException.class)
+  @Test(expected = ProgramFailureException.class)
   public void testGetSchemaThrowsExceptionOnDistinct() throws SQLException {
     when(metadata.getColumnType(eq(1))).thenReturn(Types.DISTINCT);
     reader.getSchema(metadata, 1);
   }
 
-  @Test(expected = SQLException.class)
+  @Test(expected = ProgramFailureException.class)
   public void testGetSchemaThrowsExceptionOnJavaObject() throws SQLException {
     when(metadata.getColumnType(eq(1))).thenReturn(Types.JAVA_OBJECT);
     reader.getSchema(metadata, 1);
   }
 
-  @Test(expected = SQLException.class)
+  @Test(expected = ProgramFailureException.class)
   public void testGetSchemaThrowsExceptionOnOther() throws SQLException {
     when(metadata.getColumnType(eq(1))).thenReturn(Types.OTHER);
     reader.getSchema(metadata, 1);
   }
 
-  @Test(expected = SQLException.class)
+  @Test(expected = ProgramFailureException.class)
   public void testGetSchemaThrowsExceptionOnRef() throws SQLException {
     when(metadata.getColumnType(eq(1))).thenReturn(Types.REF);
     reader.getSchema(metadata, 1);
   }
 
-  @Test(expected = SQLException.class)
+  @Test(expected = ProgramFailureException.class)
   public void testGetSchemaThrowsExceptionOnSQLXML() throws SQLException {
     when(metadata.getColumnType(eq(1))).thenReturn(Types.SQLXML);
     reader.getSchema(metadata, 1);
   }
 
-  @Test(expected = SQLException.class)
+  @Test(expected = ProgramFailureException.class)
   public void testGetSchemaThrowsExceptionOnStruct() throws SQLException {
     when(metadata.getColumnType(eq(1))).thenReturn(Types.STRUCT);
     reader.getSchema(metadata, 1);
diff --git a/pom.xml b/pom.xml
index a469f7cb5..202360169 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- version properties -->
     <cdap.version>6.11.0-SNAPSHOT</cdap.version>
-    <cdap.plugin.version>2.14.0-SNAPSHOT</cdap.plugin.version>
+    <cdap.plugin.version>2.13.0-SNAPSHOT</cdap.plugin.version>
     <guava.version>13.0.1</guava.version>
     <hadoop.version>3.3.6</hadoop.version>
     <hsql.version>2.2.4</hsql.version>