diff --git a/build.xml b/build.xml
index b398b6a2c75a..7da62739e96e 100644
--- a/build.xml
+++ b/build.xml
@@ -2109,13 +2109,13 @@
   </target>
 
   <target name="test-nio" description="Runs the JUnit test cases for NIO. Does not stop on errors."
-          depends="-test-name-default,setup-jacoco,test-compile,deploy,test-openssl-exists" if="${execute.test.nio}">
+          depends="-test-name-default,setup-jacoco,test-compile,deploy,test-openssl-exists,test-tcnative-exists" if="${execute.test.nio}">
     <runtests protocol="org.apache.coyote.http11.Http11NioProtocol"
               extension=".NIO" />
   </target>
 
   <target name="test-only-nio" description="Runs the JUnit test cases or NIO without test preparations. Does not stop on errors."
-          depends="-test-name-default,setup-jacoco,test-openssl-exists" if="${execute.test.nio}">
+          depends="-test-name-default,setup-jacoco,test-openssl-exists,test-tcnative-exists" if="${execute.test.nio}">
     <runtests protocol="org.apache.coyote.http11.Http11NioProtocol"
               extension=".NIO" />
   </target>
@@ -2134,6 +2134,24 @@
         </and>
       </or>
     </condition>
+    <echo message="OpenSSL is not available. OpenSSL-related tests will be skipped or may fail." level="warning" unless:set="test.openssl.exists"/>
+  </target>
+
+  <target name="test-tcnative-exists" description="Checks for the Tomcat Native library">
+    <condition property="test.tcnative.exists">
+      <or>
+        <resourcecount when="gt" count="0">
+          <fileset dir="${test.apr.loc}" includes="libtcnative-*.so" erroronmissingdir="false"/>
+        </resourcecount>
+        <resourcecount when="gt" count="0">
+          <fileset dir="${test.apr.loc}" includes="libtcnative-*.dylib" erroronmissingdir="false"/>
+        </resourcecount>
+        <resourcecount when="gt" count="0">
+          <fileset dir="${test.apr.loc}" includes="tcnative-*.dll" erroronmissingdir="false"/>
+        </resourcecount>
+      </or>
+    </condition>
+    <echo message="Tomcat Native is not available. Tomcat Native (JNI) tests will be skipped." level="warning" unless:set="test.tcnative.exists"/>
   </target>
 
   <target name="test-httpd-exists" description="Checks for the httpd binary">
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3241cdcb0f94..df918a9eebb7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -343,6 +343,13 @@
       <update>
         Update Derby to 10.17.1.0. (markt)
       </update>
+      <add>
+        Add warning when OpenSSL binary is not found. (csutherl)
+      </add>
+      <add>
+        Add check for Tomcat Native library, and log warning when it's not found
+        to make it easier to see when it's not used by the suite. (csutherl)
+      </add>
       <!-- Entries for backport and removal before 12.0.0-M1 below this line -->
     </changelog>
   </subsection>