diff --git a/tests/java_api/Balls/Android.bp b/tests/java_api/Balls/Android.bp
index e931d3e..50726fa 100644
--- a/tests/java_api/Balls/Android.bp
+++ b/tests/java_api/Balls/Android.bp
@@ -43,6 +43,7 @@
     name: "RsBalls-rscript",
     srcs: [
         "src/**/*.rscript",
+        "src/**/*.rsh",
         ":rs_script_api",
         ":rs_clang_headers",
     ],
diff --git a/tests/java_api/ImageProcessing/Android.bp b/tests/java_api/ImageProcessing/Android.bp
index 6ac2167..109917a 100644
--- a/tests/java_api/ImageProcessing/Android.bp
+++ b/tests/java_api/ImageProcessing/Android.bp
@@ -41,6 +41,7 @@
     name: "ImageProcessing-rscript",
     srcs: [
         "src/**/*.rscript",
+        "src/**/*.rsh",
         ":rs_script_api",
         ":rs_clang_headers",
     ],
diff --git a/tests/java_api/ImageProcessing2/Android.bp b/tests/java_api/ImageProcessing2/Android.bp
index 85c3a14..80aee1b 100644
--- a/tests/java_api/ImageProcessing2/Android.bp
+++ b/tests/java_api/ImageProcessing2/Android.bp
@@ -39,6 +39,7 @@
     name: "ImageProcessing2-rscript",
     srcs: [
         "src/**/*.rscript",
+        "src/**/*.rsh",
         ":rs_script_api",
         ":rs_clang_headers",
     ],
diff --git a/tests/java_api/ImageProcessing_jb/Android.bp b/tests/java_api/ImageProcessing_jb/Android.bp
index 9ffa7ed..8ca36e2 100644
--- a/tests/java_api/ImageProcessing_jb/Android.bp
+++ b/tests/java_api/ImageProcessing_jb/Android.bp
@@ -41,6 +41,7 @@
     name: "ImageProcessingJB-rscript",
     srcs: [
         "src/**/*.rscript",
+        "src/**/*.rsh",
         ":rs_script_api",
         ":rs_clang_headers",
     ],
diff --git a/tests/java_api/RSUnitTests/Android.bp b/tests/java_api/RSUnitTests/Android.bp
index 7d35d9f..04b4d6f 100644
--- a/tests/java_api/RSUnitTests/Android.bp
+++ b/tests/java_api/RSUnitTests/Android.bp
@@ -34,6 +34,13 @@
 }
 
 filegroup {
+    name: "RSUnitTests_rscript_hdrs",
+    srcs: [
+        "src/**/*.rsh",
+    ],
+}
+
+filegroup {
     name: "RSUnitTests_java_gui",
     srcs: [
         "gui/**/*.java",
diff --git a/tests/java_api/Refocus/Android.bp b/tests/java_api/Refocus/Android.bp
index 26af7aa..aff5b3a 100644
--- a/tests/java_api/Refocus/Android.bp
+++ b/tests/java_api/Refocus/Android.bp
@@ -42,6 +42,7 @@
     name: "Refocus-rscript",
     srcs: [
         "src/**/*.rscript",
+        "src/**/*.rsh",
         ":rs_script_api",
         ":rs_clang_headers",
     ],
diff --git a/tests/java_api/RsTest/Android.bp b/tests/java_api/RsTest/Android.bp
index 3695234..7b050d5 100644
--- a/tests/java_api/RsTest/Android.bp
+++ b/tests/java_api/RsTest/Android.bp
@@ -41,6 +41,7 @@
     name: "RSTest-rscript",
     srcs: [
         ":RSUnitTests_rscript_srcs",
+        ":RSUnitTests_rscript_hdrs",
         ":rs_script_api",
         ":rs_clang_headers",
     ],
diff --git a/tests/java_api/RsTest_11/Android.bp b/tests/java_api/RsTest_11/Android.bp
index 1e176d2..3133593 100644
--- a/tests/java_api/RsTest_11/Android.bp
+++ b/tests/java_api/RsTest_11/Android.bp
@@ -43,6 +43,7 @@
     name: "RSTest_v11-rscript",
     srcs: [
         "src/**/*.rscript",
+        "src/**/*.rsh",
         ":rs_script_api",
         ":rs_clang_headers",
     ],
diff --git a/tests/java_api/RsTest_14/Android.bp b/tests/java_api/RsTest_14/Android.bp
index 0f52649..9f6f4e4 100644
--- a/tests/java_api/RsTest_14/Android.bp
+++ b/tests/java_api/RsTest_14/Android.bp
@@ -43,6 +43,7 @@
     name: "RSTest_v14-rscript",
     srcs: [
         "src/**/*.rscript",
+        "src/**/*.rsh",
         ":rs_script_api",
         ":rs_clang_headers",
     ],
diff --git a/tests/java_api/RsTest_16/Android.bp b/tests/java_api/RsTest_16/Android.bp
index 50fce59..7204c93 100644
--- a/tests/java_api/RsTest_16/Android.bp
+++ b/tests/java_api/RsTest_16/Android.bp
@@ -43,6 +43,7 @@
     name: "RSTest_v16-rscript",
     srcs: [
         "src/**/*.rscript",
+        "src/**/*.rsh",
         ":rs_script_api",
         ":rs_clang_headers",
     ],