diff --git a/examples/tests/rapidProceduralChange/rapidProceduralChangeTest.js b/examples/tests/rapidProceduralChange/rapidProceduralChangeTest.js
new file mode 100644
index 0000000000..6897a1b70f
--- /dev/null
+++ b/examples/tests/rapidProceduralChange/rapidProceduralChangeTest.js
@@ -0,0 +1,91 @@
+//  rapidProceduralChangeTest.js
+//  examples/tests/rapidProceduralChange
+//
+//  Created by Eric Levin on  3/9/2016.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  This test creates primitives with fragment shaders and rapidly updates its uniforms, as well as a skybox.
+//  For the test to pass:
+//  - The primitives (cube and sphere) should update at rate of update loop, cycling through red values.
+//  - The skymap should do the same, although its periodicity may be different.
+//
+//  Under the hood, the primitives are driven by a uniform, while the skymap is driven by a timer.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+var orientation = Camera.getOrientation();
+orientation = Quat.safeEulerAngles(orientation);
+orientation.x = 0;
+orientation = Quat.fromVec3Degrees(orientation);
+
+var centerUp = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getFront(orientation)));
+centerUp.y += 0.5;
+var centerDown = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getFront(orientation)));
+centerDown.y -= 0.5;
+
+var ENTITY_SHADER_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/shaders/uniformTest.fs";
+var SKYBOX_SHADER_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/shaders/timerTest.fs";
+
+var entityData = {
+    ProceduralEntity: {
+        shaderUrl: ENTITY_SHADER_URL,
+        uniforms: { red: 0.0 }
+    }
+};
+var skyboxData = {
+    ProceduralEntity: {
+        shaderUrl: SKYBOX_SHADER_URL,
+        uniforms: { red: 0.0 }
+    }
+};
+
+var testBox = Entities.addEntity({
+    type: "Box",
+    dimensions: { x: 0.5, y: 0.5, z: 0.5 },
+    position: centerUp,
+    userData: JSON.stringify(entityData)
+});
+var testSphere = Entities.addEntity({
+    type: "Sphere",
+    dimensions: { x: 0.5, y: 0.5, z: 0.5 },
+    position: centerDown,
+    userData: JSON.stringify(entityData)
+});
+var testZone = Entities.addEntity({
+    type: "Zone",
+    dimensions: { x: 50, y: 50, z: 50 },
+    position: MyAvatar.position,
+    userData: JSON.stringify(skyboxData),
+    backgroundMode: "skybox",
+    skybox: { url: "http://kyoub.googlecode.com/svn/trunk/KYouB/textures/skybox_test.png" }
+});
+
+
+var currentTime = 0;
+
+function update(deltaTime) {
+    var red = (Math.sin(currentTime) + 1) / 2;
+    entityData.ProceduralEntity.uniforms.red = red;
+    skyboxData.ProceduralEntity.uniforms.red = red;
+    entityEdit = { userData: JSON.stringify(entityData) };
+    skyboxEdit = { userData: JSON.stringify(skyboxData) };
+
+    Entities.editEntity(testBox, entityEdit);
+    Entities.editEntity(testSphere, entityEdit);
+    Entities.editEntity(testZone, skyboxEdit);
+
+    currentTime += deltaTime;
+}
+
+Script.update.connect(update);
+
+Script.scriptEnding.connect(cleanup);
+
+function cleanup() {
+    Entities.deleteEntity(testBox);
+    Entities.deleteEntity(testSphere);
+    Entities.deleteEntity(testZone);
+}
+
diff --git a/examples/tests/rapidProceduralChange/timerTest.fs b/examples/tests/rapidProceduralChange/timerTest.fs
new file mode 100644
index 0000000000..e0fcf9d1d6
--- /dev/null
+++ b/examples/tests/rapidProceduralChange/timerTest.fs
@@ -0,0 +1,21 @@
+//
+//  timerTest.fs 
+//  examples/tests/rapidProceduralChange
+//
+//  Created by Eric Levin on 3/9/16.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  This fragment shader is designed to test the rapid changing of a uniform on the timer.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+uniform float red;
+
+vec3 getSkyboxColor() {
+    float blue = red;
+    blue = (cos(iGlobalTime) + 1) / 2;
+    return vec3(1.0, 0.0, blue);
+}
+
diff --git a/examples/tests/rapidProceduralChange/uniformTest.fs b/examples/tests/rapidProceduralChange/uniformTest.fs
new file mode 100644
index 0000000000..fe0ad6a1ea
--- /dev/null
+++ b/examples/tests/rapidProceduralChange/uniformTest.fs
@@ -0,0 +1,27 @@
+//
+//  uniformTest.fs
+//  examples/tests/rapidProceduralChange
+//
+//  Created by Eric Levin on 3/9/16.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  This fragment shader is designed to test the rapid changing of a uniform.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+uniform float red;
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord) {
+    fragColor = vec4(red, 0.0, 1.0, 1.0);
+}
+
+vec4 getProceduralColor() {
+    vec4 result;
+    vec2 position = _position.xz;
+    position += 0.5;
+    mainImage(result, position * iWorldScale.xz);
+    return result;
+}
+