diff --git a/recaptcha.test b/recaptcha.test
index 4afedf7..0d35de6 100644
--- a/recaptcha.test
+++ b/recaptcha.test
@@ -127,13 +127,17 @@ class ReCaptchaBasicTest extends DrupalWebTestCase {
 
     // Check if there is a reCAPTCHA on the login form.
     $this->drupalGet('user');
-    $this->assertRaw($grecaptcha, '[testReCaptchaOnLoginForm]: reCAPTCHA is shown on form.');
-    $this->assertRaw('<script src="https://www.google.com/recaptcha/api.js?hl=' . $language->language . '" async="async" defer="defer"></script>', '[testReCaptchaOnLoginForm]: reCAPTCHA is shown on form.');
+    $captcha_sid = $this->getCaptchaSid();
+    $grecaptcha = '<div id="g-recaptcha' . $captcha_sid . '" class="g-recaptcha" data-sitekey="' . $site_key . '" data-theme="light" data-type="image"></div>';
+    $this->assertRaw($grecaptcha, '[testReCaptchaOnLoginForm]: reCAPTCHA is shown on form.' . $grecaptcha);
+    $this->assertRaw('<script src="https://www.google.com/recaptcha/api.js?hl=' . $language->language . '&amp;onload=recaptchaOnLoad&amp;render=explicit" async="async" defer="defer"></script>', '[testReCaptchaOnLoginForm]: reCAPTCHA API script is present.');
     $this->assertNoRaw($grecaptcha . '<noscript>', '[testReCaptchaOnLoginForm]: NoScript code is not enabled for the reCAPTCHA.');
 
     // Test if the fall back url is properly build and noscript code added.
     variable_set('recaptcha_noscript', 1);
     $this->drupalGet('user');
+    $captcha_sid = $this->getCaptchaSid();
+    $grecaptcha = '<div id="g-recaptcha' . $captcha_sid . '" class="g-recaptcha" data-sitekey="' . $site_key . '" data-theme="light" data-type="image"></div>';
     $this->assertRaw($grecaptcha . '<noscript>', '[testReCaptchaOnLoginForm]: NoScript for reCAPTCHA is shown on form.');
     $this->assertRaw('https://www.google.com/recaptcha/api/fallback?k=' . $site_key . '&amp;hl=' . $language->language, '[testReCaptchaOnLoginForm]: Fallback URL with IFRAME has been found.');
 
@@ -176,4 +180,13 @@ class ReCaptchaBasicTest extends DrupalWebTestCase {
     $this->assertField('pass', t('Password field found.'), 'reCAPTCHA');
   }
 
+  /**
+   * Get captcha_sid.
+   */
+  protected function getCaptchaSid() {
+    $elements = $this->xpath('//input[@name="captcha_sid"]');
+    $captcha_sid = (int) $elements[0]['value'];
+    return $captcha_sid;
+  }
+
 }