diff --git a/proprietary/drmwvmplugin/test/TestPlugin.cpp b/proprietary/drmwvmplugin/test/TestPlugin.cpp
index 1a36313c..af9ba0ee 100644
--- a/proprietary/drmwvmplugin/test/TestPlugin.cpp
+++ b/proprietary/drmwvmplugin/test/TestPlugin.cpp
@@ -81,12 +81,8 @@ void WVMDrmPluginTest::Run()
 
     String8 url;
 
-    // Remote asset
-    url = String8("http://seawwws001.cdn.shibboleth.tv/videos/content/bbb_ffmpeg_hc_single_480p.wvm");
-    TestAsset(plugin, url);
-
-    // Remote asset using widevine:// protocol
-    url = String8("widevine://seawwws001.cdn.shibboleth.tv/videos/content/bbb_ffmpeg_hc_single_480p.wvm");
+    // Remote asset with widevine:// protocol
+    url = String8("widevine://commondatastorage.googleapis.com/wvmedia/bbb_base_480p_3br_tp.wvm");
     TestAsset(plugin, url);
 
     // Local asset using URL syntax
@@ -101,10 +97,6 @@ void WVMDrmPluginTest::Run()
     url = String8("/sdcard/Widevine/inception_base_360p_single.wvm");
     TestAsset(plugin, url, true);
 
-    // Remote asset with query parameters
-    url = String8("http://seawwws001.cdn.shibboleth.tv/videos/content/bbb_ffmpeg_hc_single_480p.wvm?a=b");
-    TestAsset(plugin, url);
-
     // Shut down and clean up
     if (plugin->terminate(0) != DRM_NO_ERROR) {
         fprintf(stderr, "onTerminate failed!\n");
@@ -143,7 +135,7 @@ void WVMDrmPluginTest::TestAcquireRights(IDrmEngine *plugin, String8 &url,
     String8 mimeType("video/wvm");
     DrmInfoRequest rightsAcquisitionInfo(DrmInfoRequest::TYPE_RIGHTS_ACQUISITION_INFO, mimeType);
     rightsAcquisitionInfo.put(String8("WVDRMServerKey"), String8(
-        "https://staging.shibboleth.tv/widevine/cypherpc/cgi-bin/GetEMMs.cgi"));
+        "https://license.uat.widevine.com/getlicense/widevine"));
     rightsAcquisitionInfo.put(String8("WVAssetURIKey"), url);
 
     if (useOpenFd) {
diff --git a/proprietary/samplePlayer/readme b/proprietary/samplePlayer/readme
index f059df6e..c0877eae 100644
--- a/proprietary/samplePlayer/readme
+++ b/proprietary/samplePlayer/readme
@@ -17,7 +17,7 @@ demo is installed to out/target/product/stingray/system/app/WidevineSamplePlayer
 
 [Download content for offline testing:]
 
-View http://seawwws001.shibboleth.tv/android/oem.html source for asset names.
+View http://pmweb.widevine.net/html/android/oem.html source for asset names.
 
 For example:
 
diff --git a/proprietary/samplePlayer/src/com/widevine/demo/SettingsActivity.java b/proprietary/samplePlayer/src/com/widevine/demo/SettingsActivity.java
index 0a4e743c..d6ac3abe 100644
--- a/proprietary/samplePlayer/src/com/widevine/demo/SettingsActivity.java
+++ b/proprietary/samplePlayer/src/com/widevine/demo/SettingsActivity.java
@@ -18,7 +18,7 @@ import android.content.Context;
 
 public class SettingsActivity extends Activity {
     // public static String CONTENT_PAGE = "/sdcard/Widevine/config.xml";
-    public static String CONTENT_PAGE = "http://seawwws001.shibboleth.tv/android/oem.html";
+    public static String CONTENT_PAGE = "http://pmweb.widevine.net/html/android/oem.html";
 
     private Context context;
     private Button updateButton;
diff --git a/proprietary/samplePlayer/src/com/widevine/demo/WidevineDrm.java b/proprietary/samplePlayer/src/com/widevine/demo/WidevineDrm.java
index 0f672c46..757fc98e 100644
--- a/proprietary/samplePlayer/src/com/widevine/demo/WidevineDrm.java
+++ b/proprietary/samplePlayer/src/com/widevine/demo/WidevineDrm.java
@@ -44,7 +44,7 @@ public class WidevineDrm {
 
     public static class Settings {
         public static String WIDEVINE_MIME_TYPE = "video/wvm";
-        public static String DRM_SERVER_URI = "https://wstfcps005.shibboleth.tv/widevine/cypherpc/cgi-bin/GetEMMs.cgi";
+        public static String DRM_SERVER_URI = "https://license.uat.widevine.com/getlicense/widevine";
         public static String DEVICE_ID = "device12345"; // use a unique device ID
         public static String PORTAL_NAME = "OEM";
 
diff --git a/proprietary/streamcontrol/test/TestPlayer.cpp b/proprietary/streamcontrol/test/TestPlayer.cpp
index 0af9f7f8..5dcba4ab 100644
--- a/proprietary/streamcontrol/test/TestPlayer.cpp
+++ b/proprietary/streamcontrol/test/TestPlayer.cpp
@@ -34,8 +34,7 @@ using namespace android;
 #define DEFAULT_BLOCK_SIZE 16*1024
 #define DEFAULT_PLAYBACK_BUFFER_SIZE 0*1024*1024
 #define DEFAULT_START_TIME "now"
-#define DEFAULT_DRM_URL "http://wstfcps005.shibboleth.tv/widevine/cypherpc/cgi-bin/GetEMMs.cgi"
-#define DEFAULT_DRM_ACK_URL "http://wstfcps005.shibboleth.tv/widevine/cypherpc/cgi-bin/Ack.cgi"
+#define DEFAULT_DRM_URL "https://license.uat.widevine.com/getlicense/widevine"
 
 #define SHOW_BITRATE 1