diff --git a/cef.gyp b/cef.gyp
index 5c7825753..e0dc30998 100644
--- a/cef.gyp
+++ b/cef.gyp
@@ -49,10 +49,10 @@
         # TODO(mark): Come up with a fancier way to do this (mac_info_plist?)
         # that automatically sets the correct INFOPLIST_FILE setting and adds
         # the file to a source group.
-        'tests/cefclient/mac/Info.plist',
+        'tests/cefclient/resources/mac/Info.plist',
       ],
       'xcode_settings': {
-        'INFOPLIST_FILE': 'tests/cefclient/mac/Info.plist',
+        'INFOPLIST_FILE': 'tests/cefclient/resources/mac/Info.plist',
         # Necessary to avoid an "install_name_tool: changing install names or
         # rpaths can't be redone" error.
         'OTHER_LDFLAGS': ['-Wl,-headerpad_max_install_names'],
@@ -1396,7 +1396,7 @@
           # be necessary to list helper-Info.plist once, not the three times it
           # is listed here.
           'mac_bundle_resources!': [
-            'tests/cefclient/mac/helper-Info.plist',
+            'tests/cefclient/resources/mac/helper-Info.plist',
           ],
           # TODO(mark): For now, don't put any resources into this app.  Its
           # resources directory will be a symbolic link to the browser app's
@@ -1405,7 +1405,7 @@
             ['exclude', '.*'],
           ],
           'xcode_settings': {
-            'INFOPLIST_FILE': 'tests/cefclient/mac/helper-Info.plist',
+            'INFOPLIST_FILE': 'tests/cefclient/resources/mac/helper-Info.plist',
             # Necessary to avoid an "install_name_tool: changing install names or
             # rpaths can't be redone" error.
             'OTHER_LDFLAGS': ['-Wl,-headerpad_max_install_names'],
@@ -1566,7 +1566,7 @@
           # be necessary to list helper-Info.plist once, not the three times it
           # is listed here.
           'mac_bundle_resources!': [
-            'tests/cefclient/mac/helper-Info.plist',
+            'tests/cefclient/resources/mac/helper-Info.plist',
           ],
           # TODO(mark): For now, don't put any resources into this app.  Its
           # resources directory will be a symbolic link to the browser app's
@@ -1575,7 +1575,7 @@
             ['exclude', '.*'],
           ],
           'xcode_settings': {
-            'INFOPLIST_FILE': 'tests/cefclient/mac/helper-Info.plist',
+            'INFOPLIST_FILE': 'tests/cefclient/resources/mac/helper-Info.plist',
             # Necessary to avoid an "install_name_tool: changing install names or
             # rpaths can't be redone" error.
             'OTHER_LDFLAGS': ['-Wl,-headerpad_max_install_names'],
diff --git a/cef_paths2.gypi b/cef_paths2.gypi
index c7abedfdf..2b6c57476 100644
--- a/cef_paths2.gypi
+++ b/cef_paths2.gypi
@@ -184,6 +184,7 @@
       'tests/cefclient/performance_test.h',
       'tests/cefclient/performance_test_setup.h',
       'tests/cefclient/performance_test_tests.cc',
+      'tests/cefclient/resource.h',
       'tests/cefclient/resource_util.h',
       'tests/cefclient/root_window.cc',
       'tests/cefclient/root_window.h',
@@ -214,7 +215,6 @@
       'tests/cefclient/osr_dragdrop_win.h',
       'tests/cefclient/osr_window_win.cc',
       'tests/cefclient/osr_window_win.h',
-      'tests/cefclient/resource.h',
       'tests/cefclient/resources/win/cefclient.ico',
       'tests/cefclient/resources/win/small.ico',
       'tests/cefclient/resource_util_win.cc',
@@ -257,10 +257,10 @@
       'tests/cefclient/scheme_test_common.cc',
     ],
     'cefclient_bundle_resources_mac': [
-      'tests/cefclient/mac/cefclient.icns',
-      'tests/cefclient/mac/English.lproj/InfoPlist.strings',
-      'tests/cefclient/mac/English.lproj/MainMenu.xib',
-      'tests/cefclient/mac/Info.plist',
+      'tests/cefclient/resources/mac/cefclient.icns',
+      'tests/cefclient/resources/mac/English.lproj/InfoPlist.strings',
+      'tests/cefclient/resources/mac/English.lproj/MainMenu.xib',
+      'tests/cefclient/resources/mac/Info.plist',
       '<@(cefclient_bundle_resources_common)',
     ],
     'cefclient_sources_linux': [
diff --git a/tests/cefclient/CMakeLists.txt.in b/tests/cefclient/CMakeLists.txt.in
index 2ee65b54e..c7e2c92c8 100644
--- a/tests/cefclient/CMakeLists.txt.in
+++ b/tests/cefclient/CMakeLists.txt.in
@@ -104,7 +104,7 @@ if(OS_MACOSX)
   add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper)
   target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
   set_target_properties(${CEF_HELPER_TARGET} PROPERTIES
-    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/helper-Info.plist
+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/resources/mac/helper-Info.plist
     )
 
   # Fix the framework link in the helper executable.
@@ -116,7 +116,7 @@ if(OS_MACOSX)
   target_link_libraries(${CEF_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS} "-framework OpenGL")
   set_target_properties(${CEF_TARGET} PROPERTIES
     RESOURCE "${CEFCLIENT_RESOURCES_SRCS}"
-    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/Info.plist
+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/resources/mac/Info.plist
     )
 
   # Copy files into the main app bundle.
@@ -143,7 +143,7 @@ if(OS_MACOSX)
   if(NOT ${CMAKE_GENERATOR} STREQUAL "Xcode")
     # Manually process and copy over resource files.
     # The Xcode generator handles this via the set_target_properties RESOURCE directive.
-    set(PREFIXES "mac/" "resources/")  # Remove these prefixes from input file paths.
+    set(PREFIXES "resources/mac/" "resources/")  # Remove these prefixes from input file paths.
     COPY_MACOSX_RESOURCES("${CEFCLIENT_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}")
   endif()
 endif()
diff --git a/tests/cefclient/mac/English.lproj/InfoPlist.strings b/tests/cefclient/resources/mac/English.lproj/InfoPlist.strings
similarity index 100%
rename from tests/cefclient/mac/English.lproj/InfoPlist.strings
rename to tests/cefclient/resources/mac/English.lproj/InfoPlist.strings
diff --git a/tests/cefclient/mac/English.lproj/MainMenu.xib b/tests/cefclient/resources/mac/English.lproj/MainMenu.xib
similarity index 100%
rename from tests/cefclient/mac/English.lproj/MainMenu.xib
rename to tests/cefclient/resources/mac/English.lproj/MainMenu.xib
diff --git a/tests/cefclient/mac/Info.plist b/tests/cefclient/resources/mac/Info.plist
similarity index 100%
rename from tests/cefclient/mac/Info.plist
rename to tests/cefclient/resources/mac/Info.plist
diff --git a/tests/cefclient/mac/cefclient.icns b/tests/cefclient/resources/mac/cefclient.icns
similarity index 100%
rename from tests/cefclient/mac/cefclient.icns
rename to tests/cefclient/resources/mac/cefclient.icns
diff --git a/tests/cefclient/mac/helper-Info.plist b/tests/cefclient/resources/mac/helper-Info.plist
similarity index 100%
rename from tests/cefclient/mac/helper-Info.plist
rename to tests/cefclient/resources/mac/helper-Info.plist
diff --git a/tools/make_distrib.py b/tools/make_distrib.py
index 160917a1c..a5d4c459d 100644
--- a/tools/make_distrib.py
+++ b/tools/make_distrib.py
@@ -586,8 +586,9 @@ elif platform == 'macosx':
     transfer_gypi_files(cef_dir, cef_paths2['cefclient_bundle_resources_mac'], \
                         'tests/cefclient/', cefclient_dir, options.quiet)
 
-    # transfer cefclient/mac files
-    copy_dir(os.path.join(cef_dir, 'tests/cefclient/mac/'), os.path.join(output_dir, 'cefclient/mac/'), \
+    # transfer cefclient/resources/mac files
+    copy_dir(os.path.join(cef_dir, 'tests/cefclient/resources/mac/'), \
+             os.path.join(output_dir, 'cefclient/resources/mac/'), \
              options.quiet)
 
     # transfer cefsimple files