diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index 81a3fbc38..e3aa1b7d8 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -40,11 +40,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversationsReuseIdentifier";
 
-#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name)                                                   \
-    ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name])
-#define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name)                                               \
-    _variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name))
-
 typedef NS_ENUM(NSInteger, HomeViewMode) {
     HomeViewMode_Archive,
     HomeViewMode_Inbox,
diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m
index 8321fb872..96417a830 100644
--- a/Signal/src/ViewControllers/ProfileViewController.m
+++ b/Signal/src/ViewControllers/ProfileViewController.m
@@ -18,14 +18,10 @@
 #import <SignalMessaging/UIViewController+OWS.h>
 #import <SignalServiceKit/NSString+SSK.h>
 #import <SignalServiceKit/OWSPrimaryStorage.h>
+#import <SignalMessaging/UIUtil.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name)                                                   \
-    ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name])
-#define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name)                                               \
-    _variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name))
-
 typedef NS_ENUM(NSInteger, ProfileViewMode) {
     ProfileViewMode_AppSettings = 0,
     ProfileViewMode_Registration,
diff --git a/Signal/src/ViewControllers/Registration/RegistrationViewController.m b/Signal/src/ViewControllers/Registration/RegistrationViewController.m
index 374e2c742..1f9de366e 100644
--- a/Signal/src/ViewControllers/Registration/RegistrationViewController.m
+++ b/Signal/src/ViewControllers/Registration/RegistrationViewController.m
@@ -15,14 +15,10 @@
 #import <SignalMessaging/OWSNavigationController.h>
 #import <SignalServiceKit/NSString+SSK.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
+#import <SignalMessaging/UIUtil.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name)                                                   \
-    ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name])
-#define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name)                                               \
-    _variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name))
-
 #ifdef DEBUG
 
 NSString *const kKeychainService_LastRegistered = @"kKeychainService_LastRegistered";
diff --git a/SignalMessaging/utils/UIUtil.h b/SignalMessaging/utils/UIUtil.h
index 5119c7eda..715c4be62 100644
--- a/SignalMessaging/utils/UIUtil.h
+++ b/SignalMessaging/utils/UIUtil.h
@@ -7,6 +7,11 @@
 #import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/UIImage+OWS.h>
 
+#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name)                                                   \
+([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name])
+#define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name)                                               \
+_variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name))
+
 typedef void (^completionBlock)(void);
 
 /**