Index: tests/qunit/fixtures/customize-menus.js
===================================================================
--- tests/qunit/fixtures/customize-menus.js	(revision 33451)
+++ tests/qunit/fixtures/customize-menus.js	(working copy)
@@ -1,3 +1,4 @@
+
 window._wpCustomizeNavMenusSettings = {
 	'nonce': 'yo',
 	'phpIntMax': '2147483647',
@@ -97,7 +98,6 @@
 		'untitled': '(no label)'
 	}
 };
-
 window._wpCustomizeSettings.panels.nav_menus = {
 	'id': 'nav_menus',
 	'description': '<p>This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.</p><p>Menus can be displayed in locations defined by your theme or in <a href="javascript:wp.customize.panel( "widgets" ).focus();">widget areas</a> by adding a &#8220;Custom Menu&#8221; widget.</p>',
@@ -109,6 +109,59 @@
 	'instanceNumber': 2
 };
 
+window._wpCustomizeSettings.sections = {
+  'menu_locations': {
+    'id': 'menu_locations',
+    'description': '<p>Your theme contains 1 menu location. Select which menu you would like to use.<\/p><p>You can also place menus in widget areas with the Custom Menu widget.<\/p>',
+    'priority': 5,
+    'panel': 'nav_menus',
+    'type': 'default',
+    'title': 'Menu Locations',
+    'content': '',
+    'active': true,
+    'instanceNumber': 13,
+    'customizeAction': 'Customizing &#9656; Menus'
+  },
+  'nav_menu[3]': {
+    'id': 'nav_menu[3]',
+    'description': '',
+    'priority': 10,
+    'panel': 'nav_menus',
+    'type': 'nav_menu',
+    'title': 'Cool Menu',
+    'content': '',
+    'active': true,
+    'instanceNumber': 15,
+    'customizeAction': 'Customizing &#9656; Menus',
+    'menu_id': 3
+  },
+  'nav_menu[2]': {
+    'id': 'nav_menu[2]',
+    'description': '',
+    'priority': 10,
+    'panel': 'nav_menus',
+    'type': 'nav_menu',
+    'title': 'Awesome menu',
+    'content': '',
+    'active': true,
+    'instanceNumber': 14,
+    'customizeAction': 'Customizing &#9656; Menus',
+    'menu_id': 2
+  },
+  'add_menu': {
+    'id': 'add_menu',
+    'description': '',
+    'priority': 999,
+    'panel': 'nav_menus',
+    'type': 'new_menu',
+    'title': 'Add a Menu',
+    'content': '<li id="accordion-section-add_menu" class="accordion-section-new-menu">\n\t\t\t<button type="button" class="button-secondary add-new-menu-item add-menu-toggle" aria-expanded="false">\n\t\t\t\tAdd a Menu\t\t\t<\/button>\n\t\t\t<ul class="new-menu-section-content"><\/ul>\n\t\t<\/li>',
+    'active': true,
+    'instanceNumber': 16,
+    'customizeAction': 'Customizing &#9656; Menus'
+  }
+};
+
 window.wpNavMenu = {
 	'options': {
 		'menuItemDepthPerLevel': 30,
Index: tests/qunit/wp-admin/js/customize-nav-menus.js
===================================================================
--- tests/qunit/wp-admin/js/customize-nav-menus.js	(revision 33451)
+++ tests/qunit/wp-admin/js/customize-nav-menus.js	(working copy)
@@ -1,21 +1,24 @@
 /* global wp */
-jQuery( function( ) {
+jQuery( function( $ ) {
 
 	var api = wp.customize,
         settings = window._wpCustomizeNavMenusSettings,
-        navMenu = window.wpNavMenu;
+        navMenu = window.wpNavMenu,
+        customizeSettings = window._wpCustomizeSettings;
         
 	module( 'Customize Nav Menus', {
 		setup: function() {
             window._wpCustomizeNavMenusSettings = settings; 
             window.wpNavMenu = navMenu;
+            wp.customize.trigger( 'ready' );
 		},
 		teardown: function() {
 			// restore defaults
-            window._wpCustomizeNavMenusSettings = settings; 
-            window.wpNavMenu = navMenu;
+            window._wpCustomizeNavMenusSettings = {}; 
+            window.wpNavMenu = {};
+            window._wpCustomizeSettings = customizeSettings;
+        
 		}
-
 	});
 
 
@@ -29,6 +32,7 @@
 		while( testIterations-- > 0 ) {
 			var placeholderID = api.Menus.generatePlaceholderAutoIncrementId();
 
+
 			ok( -1 === ids.indexOf( placeholderID ) );
 			ids.push( placeholderID );
 		}
@@ -39,5 +43,9 @@
 		deepEqual( window._wpCustomizeNavMenusSettings, api.Menus.data );
 	});
 
+    test( 'empty menus should have no Menu Item Controls', function() {
+        equal( $.isEmptyObject( wp.customize.Menus.getMenuControl( "2" ).getMenuItemControls() ) , true, 'empty menus' );
+    });
 
+
 });