diff --git a/rsContext.cpp b/rsContext.cpp
index 0fd9a71..2112ace 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -312,6 +312,11 @@
     rsc->props.mLogVisual = getProp("debug.rs.visual") != 0;
     rsc->props.mDebugMaxThreads = getProp("debug.rs.max-threads");
 
+    if (getProp("debug.rs.debug") != 0) {
+        ALOGD("Forcing debug context due to debug.rs.debug.");
+        rsc->mContextType = RS_CONTEXT_TYPE_DEBUG;
+    }
+
     bool loadDefault = true;
 
     // Provide a mechanism for dropping in a different RS driver.