diff --git a/D7-core-selenium.patch b/D7-core-selenium.patch
deleted file mode 100755
index 5e0ff76..0000000
--- a/D7-core-selenium.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
-index bbddde2..c917715 100644
---- a/includes/bootstrap.inc
-+++ b/includes/bootstrap.inc
-@@ -2469,9 +2469,10 @@
-     // The file properties add more entropy not easily accessible to others.
-     $key = $drupal_hash_salt . filectime(__FILE__) . fileinode(__FILE__);
-     $time_diff = REQUEST_TIME - $time;
--    // Since we are making a local request a 5 second time window is allowed,
--    // and the HMAC must match.
--    if ($time_diff >= 0 && $time_diff <= 5 && $hmac == drupal_hmac_base64($check_string, $key)) {
-+    // Since we are making a local request a 5 seconds time window is allowed,
-+    // and the HMAC must match. However, for selenium it's usually not enough to
-+    // pull-up a browser window and render a page, so we set 500 seconds window.
-+    if ($time_diff >= 0 && $time_diff <= 500 && $hmac == drupal_hmac_base64($check_string, $key)) {
-       $test_prefix = $prefix;
-       return $test_prefix;
-     }
diff --git a/drupal_selenium_web_test_case.php b/drupal_selenium_web_test_case.php
index bea28b8..fab43b1 100755
--- a/drupal_selenium_web_test_case.php
+++ b/drupal_selenium_web_test_case.php
@@ -217,12 +217,11 @@ class DrupalSeleniumWebTestCase extends DrupalWebTestCase {
     if ($screenshot) {
       // Prepare directory.
       $directory = $this->originalFileDirectory . '/simpletest/verbose/screenshots';
-      $writable = file_prepare_directory($directory, FILE_CREATE_DIRECTORY);
+      $writable = file_check_directory($directory, FILE_CREATE_DIRECTORY);
       if ($writable) {
         $testname = $this->getTestName();
         // Trying to save screenshot to verbose directory.
-        $file = file_unmanaged_save_data($screenshot, $this->originalFileDirectory . '/simpletest/verbose/screenshots/' . $testname . '.png', FILE_EXISTS_RENAME);
-
+        $file = file_save_data($screenshot, $this->originalFileDirectory . '/simpletest/verbose/screenshots/' . $testname . '.png', FILE_EXISTS_RENAME);
         // Adding verbose message with link to screenshot.
         $this->error(l(t('Screenshot created.'), $GLOBALS['base_url'] . '/' . $file, array('attributes' => array('target' => '_blank'))), 'User notice');
       }
@@ -2197,7 +2196,7 @@ class SeleniumWebElement {
 class SeleniumFirefoxDriver extends SeleniumWebDriver {
   function __construct($user_agent, $test_id) {
     $temporary_path = file_directory_temp();
-    file_prepare_directory($temporary_path);
+    file_check_directory($temporary_path);
     $zip_file_path = $temporary_path . '/' . $test_id . '_firefox_profile.zip';
 
     // Generate Firefox profile.
diff --git a/selenium.info b/selenium.info
index 4cb5077..129d068 100644
--- a/selenium.info
+++ b/selenium.info
@@ -1,7 +1,7 @@
 name = Selenium testing
 description = Integrates Selenium framework with simpletest.
 package = Development
-core = 7.x
+core = 6.x
 
 files[] = selenium.install
 files[] = drupal_selenium_web_test_case.php
diff --git a/tests/textarea.test b/tests/textarea.test
index 54ab891..e60b652 100644
--- a/tests/textarea.test
+++ b/tests/textarea.test
@@ -23,22 +23,22 @@ class TextareaTestCase extends DrupalSeleniumWebTestCase {
   }
 
   /**
-   * Test textarea functionality on article node form.
+   * Test textarea functionality on story node form.
    */
-  function testCreateArticle() {
+  function testCreateStory() {
     // Login user.
-    $user = $this->drupalCreateUser(array('administer nodes', 'bypass node access'));
+    $user = $this->drupalCreateUser(array('administer nodes', 'access content'));
     $this->drupalLogin($user);
 
-    $this->drupalGet('node/add/article');
+    $this->drupalGet('node/add/story');
 
     $this->verboseScreenshot();
 
     // Get current height of the textarea.
-    $textarea_element = $this->driver->getElement('id=edit-body-und-0-value');
+    $textarea_element = $this->driver->getElement('id=edit-body');
     $height = $textarea_element->getCssValue('height');
 
-    $grip_element = $this->driver->getElement('css=.form-item-body-und-0-value div.grippie');
+    $grip_element = $this->driver->getElement('css=div#edit-body-wrapper.form-item div.resizable-textarea:nth-of-type(2) span div.grippie');
 
     // Drag resize element to increase the height.
     $grip_element->moveCursorCenter();
