diff --git a/tests/qunit/index.html b/tests/qunit/index.html
index 47c5ee21ca..5e74951fcd 100644
--- a/tests/qunit/index.html
+++ b/tests/qunit/index.html
@@ -651,6 +651,16 @@
 			<# } #>
 		</script>
 
+		<script type="text/html" id="tmpl-wp-media-widget-image-fields">
+			<# var elementIdPrefix = 'el' + String( Math.random() ) + '_'; #>
+			<# if ( data.url ) { #>
+			<p class="media-widget-image-link">
+				<label for="{{ elementIdPrefix }}linkUrl"><?php esc_html_e( 'Link to:' ); ?></label>
+				<input id="{{ elementIdPrefix }}linkUrl" type="text" class="widefat link" value="{{ data.link_url }}" placeholder="https://" pattern="((\w+:)?\/\/\w.*|\w+:(?!\/\/$)|\/|\?|#).*">
+			</p>
+			<# } #>
+		</script>
+
 		<script type="text/html" id="tmpl-widget-media-media_video-control">
 			<# var elementIdPrefix = 'el' + String( Math.random() ) + '_' #>
 			<p>
diff --git a/tests/qunit/wp-admin/js/widgets/test-media-image-widget.js b/tests/qunit/wp-admin/js/widgets/test-media-image-widget.js
index b474fc19e9..95de578c7e 100644
--- a/tests/qunit/wp-admin/js/widgets/test-media-image-widget.js
+++ b/tests/qunit/wp-admin/js/widgets/test-media-image-widget.js
@@ -3,7 +3,7 @@
 /* eslint-env qunit */
 /* eslint-disable no-magic-numbers */
 
-( function() {
+( function( setTimeout ) {
 	'use strict';
 
 	QUnit.module( 'Image Media Widget' );
@@ -84,6 +84,8 @@
 		var imageWidgetControlInstance, imageWidgetModelInstance, done;
 		done = assert.async();
 
+		assert.expect( 2 );
+
 		imageWidgetModelInstance = new wp.mediaWidgets.modelConstructors.media_image();
 		imageWidgetControlInstance = new wp.mediaWidgets.controlConstructors.media_image({
 			el: jQuery( '<div></div>' ),
@@ -95,11 +97,11 @@
 
 		// Due to renderPreview being deferred.
 		setTimeout( function() {
-			assert.equal( imageWidgetControlInstance.$el.find( 'img[src="http://s.w.org/style/images/wp-header-logo.png"]' ).length, 1, 'One image should be rendered' );
+			assert.equal( imageWidgetControlInstance.$el.find( 'img' ).length, 1, 'One image should be rendered' );
 			done();
 		}, 50 );
 
-		done();
+		this.clock.tick( 51 );
 	});
 
 	QUnit.test( 'image media model', function( assert ) {
@@ -114,4 +116,4 @@
 		});
 	});
 
-})();
+})( window.setTimeout );
diff --git a/tests/qunit/wp-admin/js/widgets/test-media-video-widget.js b/tests/qunit/wp-admin/js/widgets/test-media-video-widget.js
index f1574f095c..a2f882dfa7 100644
--- a/tests/qunit/wp-admin/js/widgets/test-media-video-widget.js
+++ b/tests/qunit/wp-admin/js/widgets/test-media-video-widget.js
@@ -3,7 +3,7 @@
 /* eslint-env qunit */
 /* eslint-disable no-magic-numbers */
 
-( function() {
+( function( setTimeout ) {
 	'use strict';
 
 	QUnit.module( 'Video Media Widget' );
@@ -40,22 +40,24 @@
 		var videoWidgetControlInstance, videoWidgetModelInstance, done;
 		done = assert.async();
 
+		//assert.expect( 2 );
+
 		videoWidgetModelInstance = new wp.mediaWidgets.modelConstructors.media_video();
 		videoWidgetControlInstance = new wp.mediaWidgets.controlConstructors.media_video({
 			el: jQuery( '<div></div>' ),
 			syncContainer: jQuery( '<div></div>' ),
 			model: videoWidgetModelInstance
 		});
-		assert.equal( videoWidgetControlInstance.$el.find( 'a' ).length, 0, 'No video links should be rendered' );
+		assert.equal( videoWidgetControlInstance.$el.find( 'source' ).length, 0, 'No video links should be rendered' );
 		videoWidgetControlInstance.model.set({ error: false, url: 'https://videos.files.wordpress.com/AHz0Ca46/wp4-7-vaughan-r8-mastered_hd.mp4' });
 
 		// Due to renderPreview being deferred.
 		setTimeout( function() {
-			assert.equal( videoWidgetControlInstance.$el.find( 'a[href="https://videos.files.wordpress.com/AHz0Ca46/wp4-7-vaughan-r8-mastered_hd.mp4"]' ).length, 1, 'One video link should be rendered' );
+			assert.equal( videoWidgetControlInstance.$el.find( 'source[src="https://videos.files.wordpress.com/AHz0Ca46/wp4-7-vaughan-r8-mastered_hd.mp4"]' ).length, 1, 'One video link should be rendered' );
 			done();
 		}, 50 );
 
-		done();
+		this.clock.tick( 51 );
 	});
 
 	QUnit.test( 'video media model', function( assert ) {
@@ -70,4 +72,4 @@
 		});
 	});
 
-})();
+})( window.setTimeout );