diff --git a/docs/app/js/preload.js b/docs/app/js/preload.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/components/input/input.js b/src/components/input/input.js
index 65beb9e577c..f97a4cfa7e0 100644
--- a/src/components/input/input.js
+++ b/src/components/input/input.js
@@ -98,7 +98,7 @@ function labelDirective() {
     restrict: 'E',
     require: '^?mdInputContainer',
     link: function(scope, element, attr, containerCtrl) {
-      if (!containerCtrl || attr.mdNoFloat) return;
+      if (!containerCtrl || attr.mdNoFloat || element.hasClass('md-container-ignore')) return;
 
       containerCtrl.label = element;
       scope.$on('$destroy', function() {
diff --git a/src/components/input/input.scss b/src/components/input/input.scss
index 7d3eb74e10a..69799d7dde7 100644
--- a/src/components/input/input.scss
+++ b/src/components/input/input.scss
@@ -87,14 +87,14 @@ md-input-container {
     -ms-flex-preferred-size: auto; //IE fix
   }
 
-  label {
+  label:not(.md-container-ignore) {
     position: absolute;
     bottom: 100%;
     left: 0;
   }
 
 
-  label:not(.md-no-float),
+  label:not(.md-no-float):not(.md-container-ignore),
   .md-placeholder {
     order: 1;
     pointer-events: none;
diff --git a/src/components/select/select.js b/src/components/select/select.js
index 81e0e958882..da45fe21bfe 100755
--- a/src/components/select/select.js
+++ b/src/components/select/select.js
@@ -132,6 +132,7 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
       element.append(angular.element('<md-content>').append(element.contents()));
     }
 
+
     // Add progress spinner for md-options-loading
     if (attr.mdOnOpen) {
 
@@ -173,17 +174,18 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
     // Use everything that's left inside element.contents() as the contents of the menu
     var multiple = angular.isDefined(attr.multiple) ? 'multiple' : '';
     var selectTemplate = '' +
-      '<div class="md-select-menu-container">' +
+      '<div class="md-select-menu-container" aria-hidden="true">' +
       '<md-select-menu {0}>{1}</md-select-menu>' +
       '</div>';
 
     selectTemplate = $mdUtil.supplant(selectTemplate, [multiple, element.html()]);
     element.empty().append(valueEl);
+    element.append(selectTemplate);
 
     attr.tabindex = attr.tabindex || '0';
 
     return function postLink(scope, element, attr, ctrls) {
-      var isDisabled;
+      var isDisabled, ariaLabelBase;
 
       // Remove event ngModel's blur listener for touched and untouched
       // we will do it ourself.
@@ -218,7 +220,7 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
 
       var selectContainer, selectScope, selectMenuCtrl;
 
-      createSelect();
+      findSelectContainer();
       $mdTheming(element);
 
       if (attr.name && formCtrl) {
@@ -241,6 +243,7 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
       ngModelCtrl.$render = function() {
         originalRender();
         syncLabelText();
+        syncAriaLabel();
         inputCheckValue();
       };
 
@@ -290,15 +293,17 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
       };
 
       scope.$$postDigest(function() {
-        setAriaLabel();
+        initAriaLabel();
         syncLabelText();
+        syncAriaLabel();
       });
 
-      function setAriaLabel() {
-        var labelText = element.attr('placeholder');
+      function initAriaLabel() {
+        var labelText = element.attr('aria-label') || element.attr('placeholder');
         if (!labelText && containerCtrl && containerCtrl.label) {
           labelText = containerCtrl.label.text();
         }
+        ariaLabelBase = labelText;
         $mdAria.expect(element, 'aria-label', labelText);
       }
 
@@ -311,6 +316,12 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
         }
       }
 
+      function syncAriaLabel() {
+        if (!ariaLabelBase) return;
+        var ariaLabels = selectMenuCtrl.selectedLabels({mode: 'aria'});
+        element.attr('aria-label', ariaLabels.length ? ariaLabelBase + ': ' + ariaLabels : ariaLabelBase);
+      }
+
       var deregisterWatcher;
       attr.$observe('ngMultiple', function(val) {
         if (deregisterWatcher) deregisterWatcher();
@@ -324,12 +335,14 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
           } else {
             element.removeAttr('multiple');
           }
+          element.attr('aria-multiselectable', multiple ? 'true' : 'false');
           if (selectContainer) {
             selectMenuCtrl.setMultiple(multiple);
             originalRender = ngModelCtrl.$render;
             ngModelCtrl.$render = function() {
               originalRender();
               syncLabelText();
+              syncAriaLabel();
               inputCheckValue();
             };
             ngModelCtrl.$render();
@@ -365,9 +378,11 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
 
 
       var ariaAttrs = {
-        role: 'combobox',
-        'aria-expanded': 'false'
+        role: 'listbox',
+        'aria-expanded': 'false',
+        'aria-multiselectable': attr.multiple !== undefined && !attr.ngMultiple ? 'true' : 'false'
       };
+
       if (!element[0].hasAttribute('id')) {
         ariaAttrs.id = 'select_' + $mdUtil.nextUid();
       }
@@ -377,10 +392,6 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
         $mdSelect
           .destroy()
           .finally(function() {
-            if ( selectContainer ) {
-              selectContainer.remove();
-            }
-
             if (containerCtrl) {
               containerCtrl.setFocused(false);
               containerCtrl.setHasValue(false);
@@ -397,19 +408,15 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
         containerCtrl && containerCtrl.setHasValue(selectMenuCtrl.selectedLabels().length > 0 || (element[0].validity || {}).badInput);
       }
 
-      // Create a fake select to find out the label value
-      function createSelect() {
-        selectContainer = angular.element(selectTemplate);
-        var selectEl = selectContainer.find('md-select-menu');
-        selectEl.data('$ngModelController', ngModelCtrl);
-        selectEl.data('$mdSelectController', mdSelectCtrl);
-        selectScope = scope.$new();
-        $mdTheming.inherit(selectContainer, element);
+      function findSelectContainer() {
+        selectContainer = angular.element(
+          element[0].querySelector('.md-select-menu-container')
+        );
+        selectScope = selectContainer.scope();
         if (element.attr('md-container-class')) {
           var value = selectContainer[0].getAttribute('class') + ' ' + element.attr('md-container-class');
           selectContainer[0].setAttribute('class', value);
         }
-        selectContainer = $compile(selectContainer)(selectScope);
         selectMenuCtrl = selectContainer.find('md-select-menu').controller('mdSelectMenu');
       }
 
@@ -434,8 +441,9 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
         }
       }
 
-      function openSelect() {
+      function openSelect(e) {
         selectScope.isOpen = true;
+        element.attr('aria-expanded', 'true');
 
         $mdSelect.show({
           scope: selectScope,
@@ -443,10 +451,13 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
           skipCompile: true,
           element: selectContainer,
           target: element[0],
+          preserveElement: true,
+          parent: element,
           hasBackdrop: true,
           loadingAsync: attr.mdOnOpen ? scope.$eval(attr.mdOnOpen) || true : false
         }).finally(function() {
           selectScope.isOpen = false;
+          element.attr('aria-expanded', 'false');
           ngModelCtrl.$setTouched();
         });
       }
@@ -458,7 +469,8 @@ function SelectMenuDirective($parse, $mdUtil, $mdTheming) {
 
   return {
     restrict: 'E',
-    require: ['mdSelectMenu', '?ngModel'],
+    require: ['mdSelectMenu', '^ngModel'],
+    scope: true,
     controller: SelectMenuController,
     link: {pre: preLink}
   };
@@ -473,15 +485,6 @@ function SelectMenuDirective($parse, $mdUtil, $mdTheming) {
     element.on('click', clickListener);
     element.on('keypress', keyListener);
     if (ngModel) selectCtrl.init(ngModel);
-    configureAria();
-
-    function configureAria() {
-      element.attr({
-        'id': 'select_menu_' + $mdUtil.nextUid(),
-        'role': 'listbox',
-        'aria-multiselectable': (selectCtrl.isMultiple ? 'true' : 'false')
-      });
-    }
 
     function keyListener(e) {
       if (e.keyCode == 13 || e.keyCode == 32) {
@@ -621,12 +624,19 @@ function SelectMenuDirective($parse, $mdUtil, $mdTheming) {
       self.setMultiple(self.isMultiple);
     };
 
-    self.selectedLabels = function() {
+    self.selectedLabels = function(opts) {
+      opts = opts || {};
+      var mode = opts.mode || 'html';
       var selectedOptionEls = $mdUtil.nodesToArray($element[0].querySelectorAll('md-option[selected]'));
       if (selectedOptionEls.length) {
-        return selectedOptionEls.map(function(el) {
-          return el.innerHTML;
-        }).join(', ');
+        var mapFn;
+
+        if (mode == 'html') {
+          mapFn = function(el) { return el.innerHTML; };
+        } else if (mode == 'aria') {
+          mapFn = function(el) { return el.hasAttribute('aria-label') ? el.getAttribute('aria-label') : el.textContent; };
+        }
+        return selectedOptionEls.map(mapFn).join(', ');
       } else {
         return '';
       }
@@ -830,6 +840,7 @@ function OptgroupDirective() {
       labelElement = angular.element('<label>');
       el.prepend(labelElement);
     }
+    labelElement.addClass('md-container-ignore');
     if (attrs.label) labelElement.text(attrs.label);
   }
 }
@@ -842,7 +853,7 @@ function SelectProvider($$interimElementProvider) {
     });
 
   /* @ngInject */
-  function selectDefaultOptions($mdSelect, $mdConstant, $mdUtil, $window, $q, $$rAF, $animateCss, $animate) {
+  function selectDefaultOptions($mdSelect, $mdConstant, $mdUtil, $window, $q, $$rAF, $animateCss, $animate, $document) {
     var ERRROR_TARGET_EXPECTED = "$mdSelect.show() expected a target element in options.target but got '{0}'!";
     var animator = $mdUtil.dom.animator;
 
@@ -867,7 +878,7 @@ function SelectProvider($$interimElementProvider) {
       // For navigation $destroy events, do a quick, non-animated removal,
       // but for normal closes (from clicks, etc) animate the removal
 
-      return  (opts.$destroy === true) ? detachAndClean() : animateRemoval().then( detachAndClean );
+      return  (opts.$destroy === true) ? cleanElement() : animateRemoval().then( cleanElement );
 
       /**
        * For normal closes (eg clicks), animate the removal.
@@ -879,14 +890,13 @@ function SelectProvider($$interimElementProvider) {
       }
 
       /**
-       * Detach the element and cleanup prior changes
+       * Restore the element to a closed state
        */
-      function detachAndClean() {
-        configureAria(opts.target, false);
+      function cleanElement() {
 
-        element.attr('opacity', 0);
         element.removeClass('md-active');
-        detachElement(element, opts);
+        element.attr('aria-hidden', 'true');
+        element[0].style.display = 'none';
 
         announceClosed(opts);
 
@@ -904,12 +914,12 @@ function SelectProvider($$interimElementProvider) {
 
       watchAsyncLoad();
       sanitizeAndConfigure(scope, opts);
-      configureAria(opts.target);
 
       opts.hideBackdrop = showBackdrop(scope, element, opts);
 
       return showDropDown(scope, element, opts)
         .then(function(response) {
+          element.attr('aria-hidden', 'false');
           opts.alreadyOpen = true;
           opts.cleanupInteraction = activateInteraction();
           opts.cleanupResizing = activateResizing();
@@ -985,7 +995,7 @@ function SelectProvider($$interimElementProvider) {
         if (options.hasBackdrop) {
           // Override duration to immediately show invisible backdrop
           options.backdrop = $mdUtil.createBackdrop(scope, "md-select-backdrop md-click-catcher");
-          $animate.enter(options.backdrop, options.parent, null, {duration: 0});
+          $animate.enter(options.backdrop, $document[0].body, null, {duration: 0});
         }
 
         /**
@@ -996,7 +1006,7 @@ function SelectProvider($$interimElementProvider) {
           if (options.disableParentScroll) options.restoreScroll();
 
           delete options.restoreScroll;
-        }
+        };
       }
 
       /**
@@ -1057,7 +1067,7 @@ function SelectProvider($$interimElementProvider) {
           // Disable resizing handlers
           window.off('resize', debouncedOnResize);
           window.off('orientationchange', debouncedOnResize);
-        }
+        };
       }
 
       /**
@@ -1076,7 +1086,7 @@ function SelectProvider($$interimElementProvider) {
               delete opts.loadingAsync;
             }).then(function() {
               $$rAF(positionAndFocusMenu);
-            })
+            });
         }
       }
 
@@ -1097,12 +1107,12 @@ function SelectProvider($$interimElementProvider) {
         // Escape to close
         // Cycling of options, and closing on enter
         dropDown.on('keydown', onMenuKeyDown);
-        dropDown.on('mouseup', checkCloseMenu);
+        dropDown.on('click', checkCloseMenu);
 
         return function cleanupInteraction() {
           opts.backdrop && opts.backdrop.off('click', onBackdropClick);
           dropDown.off('keydown', onMenuKeyDown);
-          dropDown.off('mouseup', checkCloseMenu);
+          dropDown.off('click', checkCloseMenu);
 
           element.removeClass('md-clickable');
           opts.isRemoved = true;
@@ -1121,14 +1131,14 @@ function SelectProvider($$interimElementProvider) {
 
         function onMenuKeyDown(ev) {
           var keyCodes = $mdConstant.KEY_CODE;
+          ev.preventDefault();
+          ev.stopPropagation();
 
           switch (ev.keyCode) {
             case keyCodes.UP_ARROW:
               return focusPrevOption();
-              break;
             case keyCodes.DOWN_ARROW:
               return focusNextOption();
-              break;
             case keyCodes.SPACE:
             case keyCodes.ENTER:
               var option = $mdUtil.getClosest(ev.target, 'md-option');
@@ -1188,11 +1198,13 @@ function SelectProvider($$interimElementProvider) {
         }
 
         function checkCloseMenu(ev) {
-          if (ev && ( ev.type == 'mouseup') && (ev.currentTarget != dropDown[0])) return;
+          if (ev && ( ev.type == 'click') && (ev.currentTarget != dropDown[0])) return;
           if ( mouseOnScrollbar() ) return;
 
           var option = $mdUtil.getClosest(ev.target, 'md-option');
           if (option && option.hasAttribute && !option.hasAttribute('disabled')) {
+            ev.preventDefault();
+            ev.stopPropagation();
             if (!selectCtrl.isMultiple) {
               opts.restoreFocus = true;
 
@@ -1222,14 +1234,6 @@ function SelectProvider($$interimElementProvider) {
 
     }
 
-    /**
-     *
-     */
-    function configureAria(element, isExpanded) {
-      isExpanded = angular.isUndefined(isExpanded) ? 'true' : 'false';
-      element && element.attr('aria-expanded', isExpanded);
-    }
-
     /**
      * To notify listeners that the Select menu has closed,
      * trigger the [optional] user-defined expression
@@ -1243,23 +1247,15 @@ function SelectProvider($$interimElementProvider) {
       }
     }
 
-    /**
-     * Use browser to remove this element without triggering a $destroy event
-     */
-    function detachElement(element, opts) {
-      if (element[0].parentNode === opts.parent[0]) {
-        opts.parent[0].removeChild(element[0]);
-      }
-    }
 
     /**
      * Calculate the
      */
     function calculateMenuPositions(scope, element, opts) {
-      var optionNodes,
+      var 
         containerNode = element[0],
-        targetNode = opts.target[0].firstElementChild, // target the label
-        parentNode = opts.parent[0],
+        targetNode = opts.target[0].children[1], // target the label
+        parentNode = $document[0].body,
         selectNode = opts.selectEl[0],
         contentNode = opts.contentEl[0],
         parentRect = parentNode.getBoundingClientRect(),
@@ -1327,6 +1323,7 @@ function SelectProvider($$interimElementProvider) {
       opts.focusedNode = focusedNode;
 
       // Get the selectMenuRect *after* max-width is possibly set above
+      containerNode.style.display = 'block';
       var selectMenuRect = selectNode.getBoundingClientRect();
       var centeredRect = getOffsetRect(centeredNode);
 
@@ -1365,7 +1362,7 @@ function SelectProvider($$interimElementProvider) {
       } else {
         left = (targetRect.left + centeredRect.left - centeredRect.paddingLeft) + 2;
         top = Math.floor(targetRect.top + targetRect.height / 2 - centeredRect.height / 2 -
-            centeredRect.top + contentNode.scrollTop) + 2;
+            centeredRect.top + contentNode.scrollTop) + 5;
 
         transformOrigin = (centeredRect.left + targetRect.width / 2) + 'px ' +
           (centeredRect.top + centeredRect.height / 2 - contentNode.scrollTop) + 'px 0px';
diff --git a/src/components/select/select.scss b/src/components/select/select.scss
index ccc94be9c56..974714bec57 100755
--- a/src/components/select/select.scss
+++ b/src/components/select/select.scss
@@ -11,6 +11,7 @@ $select-max-visible-options: 5;
   top: 0;
   z-index: $z-index-select;
   opacity: 0;
+  display: none;
 
   // Don't let the user select a new choice while it's animating
   &:not(.md-clickable) {
@@ -25,6 +26,7 @@ $select-max-visible-options: 5;
 
   // enter: md-select scales in, then options fade in.
   &.md-active {
+    display: block;
     opacity: 1;
     md-select-menu {
       transition: $swift-ease-out;
diff --git a/src/components/select/select.spec.js b/src/components/select/select.spec.js
index e38dbe16364..d1db0dfbbd6 100755
--- a/src/components/select/select.spec.js
+++ b/src/components/select/select.spec.js
@@ -30,6 +30,7 @@ describe('<md-select>', function() {
   it('supports disabled state', inject(function($document) {
     var select = setupSelect('disabled="disabled", ng-model="val"').find('md-select');
     openSelect(select);
+    expectSelectClosed(select);
     expect($document.find('md-select-menu').length).toBe(0);
     expect(select.attr('aria-disabled')).toBe('true');
   }));
@@ -38,7 +39,7 @@ describe('<md-select>', function() {
     var select = setupSelect('ng-model="val", md-container-class="test"').find('md-select');
     openSelect(select);
 
-    var container = $document[0].querySelector('.md-select-menu-container');
+    var container = select[0].querySelector('.md-select-menu-container');
     expect(container).toBeTruthy();
     expect(container.classList.contains('test')).toBe(true);
   }));
@@ -50,11 +51,12 @@ describe('<md-select>', function() {
     };
     var select = setupSelect('ng-model="val", md-on-close="onClose()"', [1, 2, 3]).find('md-select');
     openSelect(select);
+    expectSelectOpen(select);
 
-    // Simulate click bubble from option to select menu handler
-    clickOption(0);
+    clickOption(select, 0);
 
     waitForSelectClose();
+    expectSelectClosed(select);
 
     expect(called).toBe(true);
   }));
@@ -84,7 +86,7 @@ describe('<md-select>', function() {
     expect(changed).toBe(false);
     
     openSelect(select);
-    clickOption(1);
+    clickOption(select, 1);
     waitForSelectClose();
     expect($rootScope.val.id).toBe(2);
     expect(changed).toBe(true);
@@ -103,23 +105,6 @@ describe('<md-select>', function() {
     expect($rootScope.myForm.select.$touched).toBe(true);
   }));
 
-  it('closes the menu during scope.$destroy()', inject(function($document, $rootScope, $timeout) {
-    var container = angular.element("<div></div>");
-    var scope = $rootScope.$new();
-    var select = setupSelect(' ng-model="val" ', [1, 2, 3], false, scope).find('md-select');
-
-    $document[0].body.appendChild(container[0]);
-    container.append(select);
-
-    openSelect(select);
-
-    scope.$destroy();
-    $rootScope.$digest();
-    $timeout.flush();
-
-    expect($document[0].querySelector("md-select-menu")).toBe(null);
-  }));
-
 
   it('restores focus to select when the menu is closed', inject(function($document) {
     var select = setupSelect('ng-model="val"').find('md-select');
@@ -142,7 +127,7 @@ describe('<md-select>', function() {
 
       openSelect(select);
 
-     $document.find('md-option')[0].click();
+      clickOption(select, 0);
 
       waitForSelectClose();
 
@@ -735,7 +720,7 @@ describe('<md-select>', function() {
       openSelect(el);
       expect(el.attr('aria-expanded')).toBe('true');
 
-      var selectMenu = $document.find('md-select-menu');
+      var selectMenu = el.find('md-select-menu');
       pressKey(selectMenu, 27);
       waitForSelectClose();
 
@@ -743,7 +728,7 @@ describe('<md-select>', function() {
     }));
     it('sets up the aria-multiselectable attribute', inject(function($document, $rootScope) {
       $rootScope.model = [1,3];
-      var el = setupMultiple('ng-model="$root.model"', [1,2,3]);
+      var el = setupSelectMultiple('ng-model="$root.model"', [1,2,3]).find('md-select');
 
       expect(el.attr('aria-multiselectable')).toBe('true');
     }));
@@ -772,32 +757,28 @@ describe('<md-select>', function() {
         var el = setupSelect('ng-model="someModel"', [1, 2, 3]).find('md-select');
         pressKey(el, 32);
         waitForSelectOpen();
-        var selectMenu = angular.element($document.find('md-select-menu'));
-        expect(selectMenu.length).toBe(1);
+        expectSelectOpen(el);
       }));
 
       it('can be opened with an enter key', inject(function($document) {
         var el = setupSelect('ng-model="someModel"', [1, 2, 3]).find('md-select');
         pressKey(el, 13);
         waitForSelectOpen();
-        var selectMenu = angular.element($document.find('md-select-menu'));
-        expect(selectMenu.length).toBe(1);
+        expectSelectOpen(el);
       }));
 
       it('can be opened with the up key', inject(function($document) {
         var el = setupSelect('ng-model="someModel"', [1, 2, 3]).find('md-select');
         pressKey(el, 38);
         waitForSelectOpen();
-        var selectMenu = angular.element($document.find('md-select-menu'));
-        expect(selectMenu.length).toBe(1);
+        expectSelectOpen(el);
       }));
 
       it('can be opened with the down key', inject(function($document) {
         var el = setupSelect('ng-model="someModel"', [1, 2, 3]).find('md-select');
         pressKey(el, 40);
         waitForSelectOpen();
-        var selectMenu = angular.element($document.find('md-select-menu'));
-        expect(selectMenu.length).toBe(1);
+        expectSelectOpen(el);
       }));
 
       it('supports typing an option name', inject(function($document, $rootScope) {
@@ -811,11 +792,12 @@ describe('<md-select>', function() {
       it('can be closed with escape', inject(function($document) {
         var el = setupSelect('ng-model="someVal"', [1, 2, 3]).find('md-select');
         openSelect(el);
-        var selectMenu = angular.element($document.find('md-select-menu'));
+        expectSelectOpen(el);
+        var selectMenu = angular.element(el.find('md-select-menu'));
         expect(selectMenu.length).toBe(1);
         pressKey(selectMenu, 27);
         waitForSelectClose();
-        expect($document.find('md-select-menu').length).toBe(0);
+        expectSelectClosed(el);
       }));
     });
   });
@@ -838,6 +820,11 @@ describe('<md-select>', function() {
     return el;
   }
 
+  function setupSelectMultiple(attrs, options, skipLabel, scope) {
+    attrs = (attrs || '') + ' multiple';
+    return setupSelect(attrs, options, skipLabel, scope);
+  }
+
   function setup(attrs, options, compileOpts) {
     var el;
     inject(function($compile, $rootScope) {
@@ -857,6 +844,7 @@ describe('<md-select>', function() {
     return setup(attrs, options);
   }
 
+
   function optTemplate(options, compileOpts) {
     var optionsTpl = '';
     inject(function($rootScope) {
@@ -915,12 +903,12 @@ describe('<md-select>', function() {
     });
   }
 
-  function clickOption(index) {
+  function clickOption(select, index) {
     inject(function($rootScope, $document) {
-      var openMenu = $document.find('md-select-menu');
-      var opt = angular.element($document.find('md-option')[index]).find('div')[0];
+      expectSelectOpen(select);
+      var openMenu = select.find('md-select-menu');
+      var opt = angular.element(select.find('md-option')[index]).find('div')[0];
 
-      if (!openMenu.length) throw Error('No select menu currently open');
       if (!opt) throw Error('Could not find option at index: ' + index);
       var target = angular.element(opt);
       angular.element(openMenu).triggerHandler({
@@ -928,11 +916,25 @@ describe('<md-select>', function() {
         target: target
       });
       angular.element(openMenu).triggerHandler({
-        type: 'mouseup',
+        type: 'click',
         target: target,
         currentTarget: openMenu[0]
       });
     });
   }
 
+  function expectSelectClosed(element) {
+    element = angular.element(element);
+    var menu = angular.element(element[0].querySelector('.md-select-menu-container'));
+    expect(menu.hasClass('md-active')).toBe(false);
+    expect(menu.attr('aria-hidden')).toBe('true');
+  }
+
+  function expectSelectOpen(element) {
+    element = angular.element(element);
+    var menu = angular.element(element[0].querySelector('.md-select-menu-container'));
+    expect(menu.hasClass('md-active')).toBe(true);
+    expect(menu.attr('aria-hidden')).toBe('false');
+  }
+
 });