1 files changed, 7 insertions, 6 deletions
diff --git a/jack-tests/src/com/android/jack/test/runtime/RuntimeTest.java b/jack-tests/src/com/android/jack/test/runtime/RuntimeTest.java
index 3fdb14ae..d1d20768 100644
--- a/jack-tests/src/com/android/jack/test/runtime/RuntimeTest.java
+++ b/jack-tests/src/com/android/jack/test/runtime/RuntimeTest.java
@@ -19,6 +19,7 @@ package com.android.jack.test.runtime;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 /**
@@ -27,15 +28,15 @@ import javax.annotation.Nonnull;
  */
 public abstract class RuntimeTest {
 
-  @Nonnull
-  protected List<RuntimeTestInfo> rtTestInfos = new ArrayList<RuntimeTestInfo>();
-
-  protected  RuntimeTest() {
-    fillRtTestInfos();
-  }
+  @CheckForNull
+  protected List<RuntimeTestInfo> rtTestInfos = null;
 
   @Nonnull
   public final List<RuntimeTestInfo> getRuntimeTestInfos() {
+    if (rtTestInfos == null) {
+      rtTestInfos = new ArrayList<RuntimeTestInfo>();
+      fillRtTestInfos();
+    }
     return rtTestInfos;
   }