diff --git a/private/property.te b/private/property.te
index 4f806d437..4fd9bc32b 100644
--- a/private/property.te
+++ b/private/property.te
@@ -632,6 +632,7 @@ neverallow {
   domain
   -init
   -remote_prov_app
+  -shell
 } remote_prov_prop:property_service set;
 
 neverallow {
diff --git a/private/shell.te b/private/shell.te
index 02105a9ce..cdbf7c2d9 100644
--- a/private/shell.te
+++ b/private/shell.te
@@ -101,6 +101,9 @@ set_prop(shell, power_debug_prop)
 # Allow shell to set this property used for rollback tests
 set_prop(shell, rollback_test_prop)
 
+# Allow shell to set RKP properties for testing purposes
+set_prop(shell, remote_prov_prop)
+
 # Allow shell to get encryption policy of /data/local/tmp/, for CTS
 allowxperm shell shell_data_file:dir ioctl {
   FS_IOC_GET_ENCRYPTION_POLICY