diff --git a/tests/autocomplete.html b/tests/autocomplete.html
index 86d77e228..609e536f8 100644
--- a/tests/autocomplete.html
+++ b/tests/autocomplete.html
@@ -19,6 +19,8 @@
 <h1>jQuery - Autocomplete Test Suite</h1>
 <div id="main" style="display: none">
 	
+	<input type="text" name="autocomplete" value="" id="autocomplete">
+	
 </div>
 
 <ol id="tests"></ol>
diff --git a/tests/autocomplete.js b/tests/autocomplete.js
index b3d36cb5a..2196e96f9 100644
--- a/tests/autocomplete.js
+++ b/tests/autocomplete.js
@@ -1,3 +1,48 @@
+test("init", function() {
+	expect(6);
+
+	el = $("#autocomplete").autocomplete();
+	ok(true, '.autocomplete() called on element');
+
+	$([]).autocomplete();
+	ok(true, '.autocomplete() called on empty collection');
+
+	$("<input/>").autocomplete();
+	ok(true, '.autocomplete() called on disconnected DOMElement');
+
+	$("<input/>").autocomplete().autocomplete("foo");
+	ok(true, 'arbitrary method called after init');
+
+	$("<input/>").autocomplete().data("foo.autocomplete");
+	ok(true, 'arbitrary option getter after init');
+
+	$("<input/>").autocomplete().data("foo.autocomplete", "bar");
+	ok(true, 'arbitrary option setter after init');
+});
+
+test("destroy", function() {
+	expect(6);
+
+	$("#autocomplete").autocomplete().autocomplete("destroy");	
+	ok(true, '.autocomplete("destroy") called on element');
+
+	$([]).autocomplete().autocomplete("destroy");
+	ok(true, '.autocomplete("destroy") called on empty collection');
+
+	$("<input/>").autocomplete().autocomplete("destroy");
+	ok(true, '.autocomplete("destroy") called on disconnected DOMElement');
+
+	$("<input/>").autocomplete().autocomplete("destroy").autocomplete("foo");
+	ok(true, 'arbitrary method called after destroy');
+
+	$("<input/>").autocomplete().autocomplete("destroy").data("foo.autocomplete");
+	ok(true, 'arbitrary option getter after destroy');
+
+	$("<input/>").autocomplete().autocomplete("destroy").data("foo.autocomplete", "bar");
+	ok(true, 'arbitrary option setter after destroy');
+});
+
+
 test("highlighter", function() {
 	equals( jQuery.Autocompleter.defaults.highlight("Peter", "Pe"), "<strong>Pe</strong>ter" );
 	equals( jQuery.Autocompleter.defaults.highlight("Peter <em>&lt;Pan&gt;</em>", "Pe"), "<strong>Pe</strong>ter <em>&lt;Pan&gt;</em>" );