diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec
index 6396a9a3f..90afc6971 100644
--- a/WordPressAuthenticator.podspec
+++ b/WordPressAuthenticator.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.5.3-beta.1"
+  s.version       = "1.5.3-beta.2"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC
diff --git a/WordPressAuthenticator/NUX/NUXButtonViewController.swift b/WordPressAuthenticator/NUX/NUXButtonViewController.swift
index bce062d80..fc0d40ad2 100644
--- a/WordPressAuthenticator/NUX/NUXButtonViewController.swift
+++ b/WordPressAuthenticator/NUX/NUXButtonViewController.swift
@@ -76,16 +76,19 @@ open class NUXButtonViewController: UIViewController {
     ///
     /// - Parameters:
     ///   - primary: Title string for primary button. Required.
+    ///   - primaryAccessibilityId: Accessibility identifier string for primary button. Optional.
     ///   - secondary: Title string for secondary button. Optional.
+    ///   - secondaryAccessibilityId: Accessibility identifier string for secondary button. Optional.
     ///   - tertiary: Title string for the tertiary button. Optional.
+    ///   - tertiaryAccessibilityId: Accessibility identifier string for tertiary button. Optional.
     ///
-    public func setButtonTitles(primary: String, secondary: String? = nil, tertiary: String? = nil) {
-        bottomButtonConfig = NUXButtonConfig(title: primary, isPrimary: true, callback: nil)
+    public func setButtonTitles(primary: String, primaryAccessibilityId: String? = nil, secondary: String? = nil, secondaryAccessibilityId: String? = nil, tertiary: String? = nil, tertiaryAccessibilityId: String? = nil) {
+        bottomButtonConfig = NUXButtonConfig(title: primary, isPrimary: true, accessibilityIdentifier: primaryAccessibilityId, callback: nil)
         if let secondaryTitle = secondary {
-            topButtonConfig = NUXButtonConfig(title: secondaryTitle, isPrimary: false, callback: nil)
+            topButtonConfig = NUXButtonConfig(title: secondaryTitle, isPrimary: false, accessibilityIdentifier: secondaryAccessibilityId, callback: nil)
         }
         if let tertiaryTitle = tertiary {
-            tertiaryButtonConfig = NUXButtonConfig(title: tertiaryTitle, isPrimary: false, callback: nil)
+            tertiaryButtonConfig = NUXButtonConfig(title: tertiaryTitle, isPrimary: false, accessibilityIdentifier: tertiaryAccessibilityId, callback: nil)
         }
     }
 
diff --git a/WordPressAuthenticator/Signin/LoginPrologueSignupMethodViewController.swift b/WordPressAuthenticator/Signin/LoginPrologueSignupMethodViewController.swift
index 5a4e9f845..185b6aa63 100644
--- a/WordPressAuthenticator/Signin/LoginPrologueSignupMethodViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginPrologueSignupMethodViewController.swift
@@ -38,7 +38,7 @@ class LoginPrologueSignupMethodViewController: NUXViewController {
 
         let loginTitle = NSLocalizedString("Sign up with Email", comment: "Button title. Tapping begins our normal sign up process.")
         let createTitle = NSLocalizedString("Sign up with Google", comment: "Button title. Tapping begins sign up using Google.")
-        buttonViewController.setupTopButton(title: loginTitle, isPrimary: false) { [weak self] in
+        buttonViewController.setupTopButton(title: loginTitle, isPrimary: false, accessibilityIdentifier: "Sign up with Email Button") { [weak self] in
             defer {
                 WordPressAuthenticator.track(.signupEmailButtonTapped)
             }
@@ -46,7 +46,7 @@ class LoginPrologueSignupMethodViewController: NUXViewController {
             self?.emailTapped?()
         }
 
-        buttonViewController.setupBottomButton(title: createTitle, isPrimary: false) { [weak self] in
+        buttonViewController.setupBottomButton(title: createTitle, isPrimary: false, accessibilityIdentifier: "Sign up with Google Button") { [weak self] in
             defer {
                 WordPressAuthenticator.track(.signupSocialButtonTapped)
             }
diff --git a/WordPressAuthenticator/Signin/LoginPrologueViewController.swift b/WordPressAuthenticator/Signin/LoginPrologueViewController.swift
index 6b10d880b..9576b2c0a 100644
--- a/WordPressAuthenticator/Signin/LoginPrologueViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginPrologueViewController.swift
@@ -66,7 +66,7 @@ class LoginPrologueViewController: LoginViewController {
         buttonViewController.setupTopButton(title: loginTitle, isPrimary: true, accessibilityIdentifier: "Prologue Log In Button") { [weak self] in
             self?.loginTapped()
         }
-        buttonViewController.setupBottomButton(title: createTitle, isPrimary: false) { [weak self] in
+        buttonViewController.setupBottomButton(title: createTitle, isPrimary: false, accessibilityIdentifier: "Prologue Signup Button") { [weak self] in
             self?.signupTapped()
         }
         if showCancel {