diff --git a/tests/src/android/renderscript/cts/oob.rs b/tests/src/android/renderscript/cts/oob.rs
new file mode 100644
index 0000000..b191c69
--- /dev/null
+++ b/tests/src/android/renderscript/cts/oob.rs
@@ -0,0 +1,12 @@
+#pragma version(1)
+#pragma rs java_package_name(android.renderscript.cts)
+
+rs_allocation aInt;
+
+void write_i(int value, uint32_t x) {
+    rsSetElementAt_int(aInt, value, x);
+}
+
+void __attribute__((kernel)) write_k(int unused) {
+    rsSetElementAt_int(aInt, 1, 1);
+}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/DebugContext.java b/tests/tests/renderscript/src/android/renderscript/cts/DebugContext.java
new file mode 100644
index 0000000..cf0f76d
--- /dev/null
+++ b/tests/tests/renderscript/src/android/renderscript/cts/DebugContext.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+
+package android.renderscript.cts;
+
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.RenderScript.RSErrorHandler;
+import android.renderscript.RSRuntimeException;
+import android.renderscript.Type;
+import android.util.Log;
+
+public class DebugContext extends RSBaseCompute {
+    Allocation AUnused;
+    Allocation AInt;
+    ScriptC_oob Soob;
+
+    boolean mRanErrorHandler = false;
+    RSErrorHandler mRsError = new RSErrorHandler() {
+        public void run() {
+            mRanErrorHandler = true;
+            Log.e("RenderscriptCTS", mErrorMessage);
+        }
+    };
+
+    protected void setupDebugContext() {
+        mRS.destroy();
+        mRS = RenderScript.create(mCtx, RenderScript.ContextType.DEBUG);
+        mRS.setMessageHandler(mRsMessage);
+        mRS.setErrorHandler(mRsError);
+
+        Soob = new ScriptC_oob(mRS);
+
+        Type.Builder typeBuilder = new Type.Builder(mRS, Element.I32(mRS));
+        Type t = typeBuilder.setX(1).create();
+
+        AInt = Allocation.createTyped(mRS, t);
+        Soob.set_aInt(AInt);
+
+        AUnused = Allocation.createTyped(mRS, t);
+    }
+
+    /**
+     * Test whether we are detect out-of-bounds allocation accesses
+     * from an invokable.
+     */
+    public void testDebugContextI() {
+        setupDebugContext();
+        Soob.invoke_write_i(7, 1);  // Write to invalid location.
+        for (int i = 0; i < 100; i++) {
+            Soob.invoke_write_i(9, 0);
+            mRS.finish();
+        }
+        Soob.destroy();
+        assertTrue(mRanErrorHandler);
+        checkForErrors();
+    }
+
+    /**
+     * Test whether we are detect out-of-bounds allocation accesses
+     * from a kernel.
+     */
+    public void testDebugContextK() {
+        setupDebugContext();
+        Soob.forEach_write_k(AUnused);  // Write to invalid location.
+        for (int i = 0; i < 100; i++) {
+            Soob.invoke_write_i(9, 0);
+            mRS.finish();
+        }
+        Soob.destroy();
+        assertTrue(mRanErrorHandler);
+        checkForErrors();
+    }
+}