diff --git a/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift b/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
index 9c22c74b2086..8a33550c8e39 100644
--- a/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
+++ b/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
@@ -13,14 +13,26 @@ private func apiBase(blog: Blog) -> URL? {
 extension WordPressOrgRestApi {
     @objc
     convenience init?(blog: Blog) {
+        self.init(
+            blog: blog,
+            userAgent: WPUserAgent.wordPress(),
+            wordPressComApiURL: WordPressComRestApi.apiBaseURL
+        )
+    }
+
+    convenience init?(
+        blog: Blog,
+        userAgent: String = WPUserAgent.wordPress(),
+        wordPressComApiURL: URL = WordPressComRestApi.apiBaseURL
+    ) {
         if let dotComID = blog.dotComID?.uint64Value,
            let token = blog.account?.authToken,
            token.count > 0 {
             self.init(
                 dotComSiteID: dotComID,
                 bearerToken: token,
-                userAgent: WPUserAgent.wordPress(),
-                apiURL: AppEnvironment.current.wordPressComApiBase
+                userAgent: userAgent,
+                apiURL: wordPressComApiURL
             )
         } else if let apiBase = apiBase(blog: blog),
                   let loginURL = try? blog.loginUrl().asURL(),
@@ -35,7 +47,7 @@ extension WordPressOrgRestApi {
                     password: password,
                     adminURL: adminURL
                 ),
-                userAgent: WPUserAgent.wordPress()
+                userAgent: userAgent
             )
         } else {
             return nil