2 files changed, 4 insertions, 6 deletions
diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java
index 6f67a945..4a8247fe 100644
--- a/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java
+++ b/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java
@@ -84,9 +84,8 @@ public class MultiDexOverflowTests {
         /* zipFile = */ false,
         srcFolder);
       Assert.fail();
-    } catch (ProcessException e) {
-      Assert.assertTrue(e.getCause() instanceof JackAbortException);
-      Throwable contextException = e.getCause().getCause();
+    } catch (JackAbortException e) {
+      Throwable contextException = e.getCause();
       Assert.assertTrue(contextException instanceof DexWritingException);
       Assert.assertTrue(contextException.getCause() instanceof MainDexOverflowException);
       Assert.assertTrue(contextException.getCause().getCause() instanceof MethodIdOverflowException);
diff --git a/jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java b/jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java
index 351b5906..558badf1 100644
--- a/jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java
+++ b/jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java
@@ -122,9 +122,8 @@ public class MergerTest011 extends MergerTestTools {
     try {
       buildOneDexPerType(srcFolder, /* withDebug = */false, /* out = */ null, err);
       Assert.fail();
-    } catch (ProcessException e) {
-      Assert.assertTrue(e.getCause() instanceof JackAbortException);
-      Throwable contextException = e.getCause().getCause();
+    } catch (JackAbortException e) {
+      Throwable contextException = e.getCause();
       Assert.assertTrue(contextException instanceof DexWritingException);
       Assert.assertTrue(contextException.getCause() instanceof SingleDexOverflowException);
       Assert.assertTrue(contextException.getCause().getCause() instanceof TypeIdOverflowException);