diff --git a/extensions/amp-sticky-ad/0.1/test/test-amp-sticky-ad.js b/extensions/amp-sticky-ad/0.1/test/test-amp-sticky-ad.js
index 097ea29d4314..47c16e57c499 100644
--- a/extensions/amp-sticky-ad/0.1/test/test-amp-sticky-ad.js
+++ b/extensions/amp-sticky-ad/0.1/test/test-amp-sticky-ad.js
@@ -18,7 +18,7 @@ import '../amp-sticky-ad';
 import '../../../amp-ad/0.1/amp-ad';
 import {poll} from '../../../../testing/iframe';
 
-describes.realWin('amp-sticky-ad 0.1 version', {
+describes.realWin.skip('amp-sticky-ad 0.1 version', {
   win: { /* window spec */
     location: '...',
     historyOff: false,
@@ -284,7 +284,7 @@ describes.realWin('amp-sticky-ad 0.1 version', {
 });
 
 
-describes.realWin('amp-sticky-ad 0.1 with real ad child', {
+describes.realWin.skip('amp-sticky-ad 0.1 with real ad child', {
   win: { /* window spec */
     location: '...',
     historyOff: false,
diff --git a/gulpfile.js b/gulpfile.js
index 8950a9fafedd..8b08462de398 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -395,6 +395,15 @@ function buildExtension(name, version, hasCss, options, opt_extraGlobs) {
   options = options || {};
   options.extraGlobs = opt_extraGlobs;
   var path = 'extensions/' + name + '/' + version;
+  if (name == 'amp-sticky-ad' && version == '0.1') {
+    // Special case for amp-sticky-ad force upgrade from v0.1 to v1.0
+    // to provide better UX. (related issue #6169).
+    // To deprecate 0.1, replace the build path so that amp-sticky-ad-0.1.js
+    // is built from extensions/amp-sticky-ad/1.0/amp-sticky-ad.js
+    // NOTE: The upgrade happens here to provide backward compatibility
+    // to existing pages with amp-sticky-ad 0.1 script.
+    path = 'extensions/' + name + '/1.0';
+  }
   var jsPath = path + '/' + name + '.js';
   var jsTestPath = path + '/test/' + 'test-' + name + '.js';
   if (argv.files && options.bundleOnlyIfListedInFiles) {
diff --git a/testing/describes.js b/testing/describes.js
index 1c0a640f38f4..0041ec382460 100644
--- a/testing/describes.js
+++ b/testing/describes.js
@@ -269,6 +269,10 @@ function describeEnv(factory) {
     return templateFunc(name, spec, fn, describe./*OK*/only);
   };
 
+  mainFunc.skip = function(name, variants, fn) {
+    return templateFunc(name, variants, fn, describe.skip);
+  };
+
   return mainFunc;
 }