diff --git a/Apps/Sandcastle/gallery/3D Tiles Formats.html b/Apps/Sandcastle/gallery/3D Tiles Formats.html
index 090b0507f34e..d01179ccf906 100644
--- a/Apps/Sandcastle/gallery/3D Tiles Formats.html	
+++ b/Apps/Sandcastle/gallery/3D Tiles Formats.html	
@@ -84,7 +84,7 @@
             resource: Cesium.IonResource.fromAssetId(3878)
         }, {
             name: 'PointCloudDraco',
-            resource: Cesium.IonResource.fromAssetId(9999)
+            resource: Cesium.IonResource.fromAssetId(4486)
         }
     ],
     selectedTileset: undefined,
diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco1/pointCloudDraco1.pnts b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco/pointCloudDraco.pnts
similarity index 100%
rename from Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco1/pointCloudDraco1.pnts
rename to Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco/pointCloudDraco.pnts
diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco1/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco/tileset.json
similarity index 89%
rename from Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco1/tileset.json
rename to Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco/tileset.json
index 1552f7e97740..4185426f4db4 100644
--- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco1/tileset.json
+++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco/tileset.json
@@ -15,7 +15,7 @@
     },
     "geometricError": 0,
     "content": {
-      "url": "pointCloudDraco1.pnts"
+      "url": "pointCloudDraco.pnts"
     }
   }
 }
diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco2/pointCloudDraco2.pnts b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoPartial/pointCloudDracoPartial.pnts
similarity index 100%
rename from Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco2/pointCloudDraco2.pnts
rename to Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoPartial/pointCloudDracoPartial.pnts
diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco2/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoPartial/tileset.json
similarity index 87%
rename from Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco2/tileset.json
rename to Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoPartial/tileset.json
index f10f27f05a3c..87da5642b30d 100644
--- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco2/tileset.json
+++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoPartial/tileset.json
@@ -15,7 +15,7 @@
     },
     "geometricError": 0,
     "content": {
-      "url": "pointCloudDraco2.pnts"
+      "url": "pointCloudDracoPartial.pnts"
     }
   }
 }
diff --git a/Specs/Scene/PointCloud3DTileContentSpec.js b/Specs/Scene/PointCloud3DTileContentSpec.js
index 88cffa34127a..69d383d99dbf 100644
--- a/Specs/Scene/PointCloud3DTileContentSpec.js
+++ b/Specs/Scene/PointCloud3DTileContentSpec.js
@@ -15,6 +15,7 @@ defineSuite([
         'Scene/Cesium3DTileStyle',
         'Scene/ClippingPlane',
         'Scene/ClippingPlaneCollection',
+        'Scene/DracoLoader',
         'Scene/Expression',
         'Specs/Cesium3DTilesTester',
         'Specs/createCanvas',
@@ -38,6 +39,7 @@ defineSuite([
         Cesium3DTileStyle,
         ClippingPlane,
         ClippingPlaneCollection,
+        DracoLoader,
         Expression,
         Cesium3DTilesTester,
         createCanvas,
@@ -59,8 +61,8 @@ defineSuite([
     var pointCloudNormalsOctEncodedUrl = './Data/Cesium3DTiles/PointCloud/PointCloudNormalsOctEncoded';
     var pointCloudQuantizedUrl = './Data/Cesium3DTiles/PointCloud/PointCloudQuantized';
     var pointCloudQuantizedOctEncodedUrl = './Data/Cesium3DTiles/PointCloud/PointCloudQuantizedOctEncoded';
-    var pointCloudDraco1Url = './Data/Cesium3DTiles/PointCloud/PointCloudDraco1';
-    var pointCloudDraco2Url = './Data/Cesium3DTiles/PointCloud/PointCloudDraco2';
+    var pointCloudDracoUrl = './Data/Cesium3DTiles/PointCloud/PointCloudDraco';
+    var pointCloudDracoPartialUrl = './Data/Cesium3DTiles/PointCloud/PointCloudDracoPartial';
     var pointCloudWGS84Url = './Data/Cesium3DTiles/PointCloud/PointCloudWGS84';
     var pointCloudBatchedUrl = './Data/Cesium3DTiles/PointCloud/PointCloudBatched';
     var pointCloudWithPerPointPropertiesUrl = './Data/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties';
@@ -244,7 +246,7 @@ defineSuite([
             // Draco decoding is not currently supported in IE
             return;
         }
-        return Cesium3DTilesTester.loadTileset(scene, pointCloudDraco1Url).then(function(tileset) {
+        return Cesium3DTilesTester.loadTileset(scene, pointCloudDracoUrl).then(function(tileset) {
             Cesium3DTilesTester.expectRender(scene, tileset);
         });
     });
@@ -254,7 +256,7 @@ defineSuite([
             // Draco decoding is not currently supported in IE
             return;
         }
-        return Cesium3DTilesTester.loadTileset(scene, pointCloudDraco2Url).then(function(tileset) {
+        return Cesium3DTilesTester.loadTileset(scene, pointCloudDracoPartialUrl).then(function(tileset) {
             Cesium3DTilesTester.expectRender(scene, tileset);
         });
     });
@@ -265,11 +267,11 @@ defineSuite([
             return;
         }
         return pollToPromise(function() {
-            return defined(PointCloud3DTileContent._getDecoderTaskProcessor());
+            return DracoLoader._taskProcessorReady;
         }).then(function() {
-            var decoder = PointCloud3DTileContent._getDecoderTaskProcessor();
+            var decoder = DracoLoader._getDecoderTaskProcessor();
             spyOn(decoder, 'scheduleTask').and.returnValue(when.reject({message : 'my error'}));
-            return Cesium3DTilesTester.loadTileset(scene, pointCloudDraco1Url).then(function(tileset) {
+            return Cesium3DTilesTester.loadTileset(scene, pointCloudDracoUrl).then(function(tileset) {
                 var root = tileset._root;
                 return root.contentReadyPromise.then(function() {
                     fail('should not resolve');
@@ -282,7 +284,7 @@ defineSuite([
 
     it('throws error if attempting to decode draco in Internet Explorer', function() {
         spyOn(FeatureDetection, 'isInternetExplorer').and.returnValue(true);
-        return Cesium3DTilesTester.loadTileset(scene, pointCloudDraco1Url).then(function(tileset) {
+        return Cesium3DTilesTester.loadTileset(scene, pointCloudDracoUrl).then(function(tileset) {
             var root = tileset._root;
             return root.contentReadyPromise.then(function() {
                 fail('should not resolve');