Worked on the adoptium/aqa-tests repository to address a compatibility issue affecting OpenJCEPlus test execution in non-FIPS environments. Implemented a targeted fix in Java and Maven-based test automation, ensuring that FIPS-related properties are excluded when FIPS flags are not present. This approach maintained full functional coverage for both FIPS and non-FIPS scenarios, allowing tests to run reliably across different security configurations. The solution stabilized continuous integration runs by reducing flaky results in non-FIPS builds and supported robust cross-environment testing. Demonstrated expertise in build tools, conditional test configuration, and secure property handling to meet evolving business and technical requirements.