diff --git a/lib/__tests__/Autocomplete-test.js b/lib/__tests__/Autocomplete-test.js
index 433def37..720cf799 100644
--- a/lib/__tests__/Autocomplete-test.js
+++ b/lib/__tests__/Autocomplete-test.js
@@ -252,16 +252,20 @@ describe('Autocomplete click event handlers', () => {
   var autocompleteInputWrapper = autocompleteWrapper.find('input');
 
   it('should update input value from selected menu item and close the menu', () => {
+    let value = 'Ar';
+    autocompleteWrapper.setProps({
+      value,
+      onSelect(v) { value = v; },
+    });
     autocompleteWrapper.setState({ isOpen: true });
-    autocompleteInputWrapper.simulate('focus');
-    autocompleteInputWrapper.simulate('change', { target: { value: 'Ar' } });
+    autocompleteInputWrapper.simulate('change', { target: { value } });
     
     // simulate keyUp of last key, triggering autocomplete suggestion + selection of the suggestion in the menu
     autocompleteInputWrapper.simulate('keyUp', { key : 'r', keyCode: 82, which: 82 }); 
 
     // Click inside input, updating state.value with the selected Autocomplete suggestion
     autocompleteInputWrapper.simulate('click');
-    expect(autocompleteWrapper.state('value')).to.equal('Arizona');
+    expect(value).to.equal('Arizona');
     expect(autocompleteWrapper.state('isOpen')).to.be.false;
   });