diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 18f43c907d8..d593e86cd65 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -6,6 +6,7 @@ We expect this code of conduct to be honored by everyone who participates in the
 
 This code is not exhaustive or complete, and is a living document. It serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter, so that it can enrich all of us and the technical communities in which we participate.
 
+Armada adheres to the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
 
 ## Our Pledge
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b34189c4aaf..338dc133392 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,6 +39,11 @@ Please try and make sure that this is linked to an [issue](https://github.com/ar
 
 **Please keep all pull requests on a separate branch with proper name!**
 
+### Testing
+
+All new functionality must include tests. CI runs the full
+test suite automatically on every pull request.
+
 ### Branches
 
 #### Squashing fix-ups
@@ -109,6 +114,11 @@ You can view the list of [good first issues](https://github.com/armadaproject/ar
 
 Armada developers appreciate and encourage coordinated disclosure of security vulnerabilities. If you believe you have a vulnerability to report, please contact the security team at [security@gr-oss.io](mailto:security@gr-oss.io) for triage.
 
+## Code of Conduct
+
+This project follows the
+[Armada Code of Conduct](https://github.com/armadaproject/armada/blob/master/CODE_OF_CONDUCT.md).
+
 ## License
 
 Armada is licensed with the Apache 2.0 license.  You can find it published here: