diff --git a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kmp b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kmp
index f0380aabe5..9785ed7338 100644
Binary files a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kmp and b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kmp differ
diff --git a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kpj b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kpj
index c7fa5c530c..80a3e1568a 100644
--- a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kpj
+++ b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kpj
@@ -1,56 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <KeymanDeveloperProject>
   <Options>
+    <Version>2.0</Version>
     <BuildPath>$PROJECTPATH</BuildPath>
+    <SourcePath>$PROJECTPATH\</SourcePath>
     <CompilerWarningsAsErrors>True</CompilerWarningsAsErrors>
-    <WarnDeprecatedCode>True</WarnDeprecatedCode>
     <CheckFilenameConventions>True</CheckFilenameConventions>
+    <SkipMetadataFiles>True</SkipMetadataFiles>
     <ProjectType>lexicalmodel</ProjectType>
   </Options>
-  <Files>
-    <File>
-      <ID>id_165fd1598b940efe4a973aeb6eb61aba</ID>
-      <Filename>keyboardharness.kps</Filename>
-      <Filepath>keyboardharness.kps</Filepath>
-      <FileVersion>1.0</FileVersion>
-      <FileType>.kps</FileType>
-      <Details>
-        <Name>keyboardharness</Name>
-        <Copyright>©2020 SIL International</Copyright>
-        <Version>1.0</Version>
-      </Details>
-    </File>
-    <File>
-      <ID>id_f9b1213d4e83cb32ce1ead1ee852d618</ID>
-      <Filename>chirality.js</Filename>
-      <Filepath>..\..\..\..\..\..\..\web\testing\chirality\chirality.js</Filepath>
-      <FileVersion></FileVersion>
-      <FileType>.js</FileType>
-      <ParentFileID>id_165fd1598b940efe4a973aeb6eb61aba</ParentFileID>
-    </File>
-    <File>
-      <ID>id_e01841691fa129428aea555142873f69</ID>
-      <Filename>platformtest.js</Filename>
-      <Filepath>..\..\..\..\..\..\..\web\testing\platform\platformtest.js</Filepath>
-      <FileVersion></FileVersion>
-      <FileType>.js</FileType>
-      <ParentFileID>id_165fd1598b940efe4a973aeb6eb61aba</ParentFileID>
-    </File>
-    <File>
-      <ID>id_03df89bb84a1aa6cab40dfebf3a04c5b</ID>
-      <Filename>code2001.ttf</Filename>
-      <Filepath>code2001.ttf</Filepath>
-      <FileVersion></FileVersion>
-      <FileType>.ttf</FileType>
-      <ParentFileID>id_165fd1598b940efe4a973aeb6eb61aba</ParentFileID>
-    </File>
-    <File>
-      <ID>id_2d07bd2b8c94e9600ac1a920c8cb9e0a</ID>
-      <Filename>longpress.js</Filename>
-      <Filepath>longpress.js</Filepath>
-      <FileVersion></FileVersion>
-      <FileType>.js</FileType>
-      <ParentFileID>id_165fd1598b940efe4a973aeb6eb61aba</ParentFileID>
-    </File>
-  </Files>
 </KeymanDeveloperProject>
diff --git a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps
index 157aefd71c..9d03ec759b 100644
--- a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps
+++ b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kps
@@ -20,7 +20,7 @@
   </Info>
   <Files>
     <File>
-      <Name>..\..\..\..\..\..\..\web\src\test\manual\web\chirality\chirality.js</Name>
+      <Name>../../../../../../../common/test/resources/keyboards/chirality.js</Name>
       <Description>File chirality.js</Description>
       <CopyLocation>0</CopyLocation>
       <FileType>.js</FileType>
diff --git a/web/src/test/manual/web/chirality/chirality.js b/common/test/resources/keyboards/chirality.js
similarity index 100%
rename from web/src/test/manual/web/chirality/chirality.js
rename to common/test/resources/keyboards/chirality.js
diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index b2eed53d0a..53a784bdf8 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -41,7 +41,7 @@ GESTURE_PROCESSOR_BUILD="$KEYMAN_ROOT/web/src/engine/osk/gesture-processor/build
 GESTURE_PROCESSOR_TARGET="$KEYMAN_ROOT/web/build/engine/gesture-processor/lib/"
 
 function do_copy() {
-  mkdir -p "$KEYMAN_ROOT/$DEST"
+  mkdir -p "$KEYMAN_ROOT/$DEST/keyboards"
 
   # The next four lines are needed for the sentry-integration manual test page.
   cp "$SENTRY_MANAGER_SRC"  "$KEYMAN_ROOT/$DEST/sentry-manager.js"
@@ -49,6 +49,9 @@ function do_copy() {
 
   mkdir -p "$GESTURE_PROCESSOR_TARGET"
   cp -a "$GESTURE_PROCESSOR_BUILD" "$GESTURE_PROCESSOR_TARGET"
+
+  # copy common test resources (keyboards)
+  cp -f "$KEYMAN_ROOT/common/test/resources/keyboards/"*.js "$KEYMAN_ROOT/$DEST/keyboards/"
 }
 
 builder_run_action clean rm -rf "$KEYMAN_ROOT/$DEST" && rm -rf "$GESTURE_PROCESSOR_TARGET"
diff --git a/web/src/test/manual/web/chirality/utilities.js b/web/src/test/manual/web/chirality/utilities.js
index 158a05c08e..16c9caaf02 100644
--- a/web/src/test/manual/web/chirality/utilities.js
+++ b/web/src/test/manual/web/chirality/utilities.js
@@ -7,7 +7,7 @@ function loadKeyboards()
     languages:{
       id:'en',name:'English',region:'North America'
     },
-    filename:'chirality.js'
+    filename:'../../../../../build/test-resources/keyboards/chirality.js'
   });
     
   // A testing keyboard using 10.0 format and the KLS layout specifier