diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index af06e0f90..34366ab3a 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -189,10 +189,17 @@ Native tests:
     coverage_target="CalendarProvider"
     continuous="true" />
 
+<test name="camerastress"
+    build_path="packages/apps/Camera/tests"
+    package="com.android.camera.tests"
+    class="com.android.camera.StressTests"
+    coverage_target="Camera" />
+
 <test name="camera"
     build_path="packages/apps/Camera/tests"
-    package="com.android.cameratests"
-    runner="CameraInstrumentationTestRunner"
+    package="com.android.camera.tests"
+    class="com.android.camera.UnitTests"
+    continuous="true"
     coverage_target="Camera" />
 
 <test name="contactsprov"