diff --git a/build-config-usertests b/build-config-usertests
new file mode 100644
index 0000000..7337dd7
--- /dev/null
+++ b/build-config-usertests
@@ -0,0 +1,50 @@
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file lists userspace tests
+
+[
+    # userspace tests that don't use storage
+    porttest("com.android.libctest"),
+    porttest("com.android.timer-unittest"),
+    porttest("com.android.ipc-unittest.ctrl"),
+    porttest("com.android.appmgmt-unittest.appmngr"),
+    porttest("com.android.appmgmt-unittest.syscalls"),
+    porttest("com.android.appmgmt-unittest.syscalls.aux"),
+
+    # userspace tests using storage available at early boot
+    needs(
+        [
+            porttest("com.android.storage-unittest.tp.init"),
+            porttest("com.android.storage-unittest.tp.check"),
+            porttest("com.android.storage-unittest.tp.clean"),
+            porttest("com.android.storage-unittest.tp"),
+            porttest("com.android.storage-unittest.tdea.init"),
+            porttest("com.android.storage-unittest.tdea.check"),
+            porttest("com.android.storage-unittest.tdea.clean"),
+            porttest("com.android.storage-unittest.tdea"),
+        ],
+        storage_boot=True,
+    ),
+
+    # Storage tests which require a nonsecure file
+    # These need Android or a similar resource to run, simple RPMB
+    # in testrunner is insufficient.
+    needs(
+        [
+            porttest("com.android.storage-unittest.td"),
+        ],
+        storage_full=True,
+    ),
+]
diff --git a/usertests-inc.mk b/usertests-inc.mk
new file mode 100644
index 0000000..66e713e
--- /dev/null
+++ b/usertests-inc.mk
@@ -0,0 +1,35 @@
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+TRUSTY_ALL_USER_TASKS += \
+	trusty/user/app/sample/app-mgmt-test/boot-start-srv \
+	trusty/user/app/sample/app-mgmt-test/client\
+	trusty/user/app/sample/app-mgmt-test/never-start-srv \
+	trusty/user/app/sample/app-mgmt-test/port-start-srv \
+	trusty/user/app/sample/app-mgmt-test/restart-srv \
+	trusty/user/app/sample/app-mgmt-test/syscalls-test/aux \
+	trusty/user/app/sample/app-mgmt-test/syscalls-test/builtin \
+	trusty/user/app/sample/app-mgmt-test/syscalls-test/main \
+	trusty/user/app/sample/ipc-unittest/main \
+	trusty/user/app/sample/ipc-unittest/srv \
+	trusty/user/app/sample/libc-test \
+	trusty/user/app/sample/storage-unittest \
+	trusty/user/app/sample/timer \
+
+TRUSTY_LOADABLE_USER_TASKS += \
+	trusty/user/app/sample/app-mgmt-test/syscalls-test/main/test_apps/duplicate_port \
+	trusty/user/app/sample/app-mgmt-test/syscalls-test/main/test_apps/load_start \
+	trusty/user/app/sample/app-mgmt-test/syscalls-test/main/test_apps/port_start \
+