diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 567863e..c6b39b6 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -21,12 +21,19 @@
 
         <!-- Miscellaneous telecomm app-related test activities. -->
 
+        <!-- TODO(santoscordon): STOPSHIP Services in this manifest need permission protection. -->
         <service android:name="com.android.telecomm.testcallservice.TestCallServiceProvider">
             <intent-filter>
                 <action android:name="android.telecomm.ICallServiceProvider" />
             </intent-filter>
         </service>
 
+        <service android:name="com.android.telecomm.testcallservice.TestCallService">
+            <intent-filter>
+                <action android:name="android.telecomm.ICallService" />
+            </intent-filter>
+        </service>
+
         <service android:name="com.android.telecomm.testcallservice.DummyCallServiceSelector">
             <intent-filter>
                 <action android:name="android.telecomm.ICallServiceSelector" />
diff --git a/tests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java b/tests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
index 31287e9..7d2c3fb 100644
--- a/tests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
+++ b/tests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
@@ -30,6 +30,7 @@
 
 /**
  * Service which provides fake calls to test the ICallService interface.
+ * TODO(santoscordon): Build more dummy providers for more CallServiceInfo.FLAG_* types.
  */
 public class TestCallServiceProvider extends CallServiceProvider {
     private static final String TAG = TestCallServiceProvider.class.getSimpleName();