diff --git a/ports/jinja2cpplight/disable-tests.patch b/ports/jinja2cpplight/disable-tests.patch
new file mode 100644
index 0000000000..e7fe20099f
--- /dev/null
+++ b/ports/jinja2cpplight/disable-tests.patch
@@ -0,0 +1,24 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,20 +38,7 @@
+     add_dependencies(Jinja2CppLight cog)
+ endif(PYTHON_AVAILABLE)
+ 
+-if(UNIX)
+-    add_library(jinja2cpplight_gtest SHARED thirdparty/gtest/gtest-all.cc)
+-    target_link_libraries(jinja2cpplight_gtest pthread)
+-else()
+-    add_library(jinja2cpplight_gtest thirdparty/gtest/gtest-all.cc)
+-endif()
+-target_include_directories(jinja2cpplight_gtest PRIVATE thirdparty/gtest)
+-
+-add_executable(jinja2cpplight_unittests thirdparty/gtest/gtest_main.cc test/testJinja2CppLight.cpp test/teststringhelper.cpp)
+-target_link_libraries(jinja2cpplight_unittests jinja2cpplight_gtest)
+-target_link_libraries(jinja2cpplight_unittests Jinja2CppLight)
+-target_include_directories(jinja2cpplight_unittests PRIVATE thirdparty/gtest)
+-
+- INSTALL(TARGETS jinja2cpplight_gtest jinja2cpplight_unittests Jinja2CppLight
++ INSTALL(TARGETS Jinja2CppLight
+     LIBRARY DESTINATION lib
+     ARCHIVE DESTINATION lib
+     RUNTIME DESTINATION bin
diff --git a/ports/jinja2cpplight/portfile.cmake b/ports/jinja2cpplight/portfile.cmake
index 7f6554ab08..6b660a016e 100644
--- a/ports/jinja2cpplight/portfile.cmake
+++ b/ports/jinja2cpplight/portfile.cmake
@@ -1,20 +1,17 @@
-if(VCPKG_TARGET_IS_UWP)
-    message(FATAL_ERROR "jinja2cpplight doesn't support UWP.")
-endif()
-
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 else()
     vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 endif()
 
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO hughperkins/Jinja2CppLight
     REF 04196b080adf6edb86184824a1cf948ace310d19 #Commits on May 8, 2018 
     SHA512 30415da5ebc4fb805953cc9ff7e5fcd357d6fa1818c1ff2570b795252de6215562cd0f2f0418a1fa60e9d74b88339a3fea7166b898f54cface6ab1cfe3581bb5
     HEAD_REF master
+    PATCHES
+        disable-tests.patch
 )
 
 vcpkg_cmake_configure(
@@ -31,6 +28,4 @@ file(COPY ${JINJA2CPPLIGHT_EXES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools")
 file(REMOVE_RECURSE ${JINJA2CPPLIGHT_EXES})
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/jinja2cpplight/vcpkg.json b/ports/jinja2cpplight/vcpkg.json
index cd3c5caf5b..84a6fc628d 100644
--- a/ports/jinja2cpplight/vcpkg.json
+++ b/ports/jinja2cpplight/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "jinja2cpplight",
   "version-date": "2018-05-08",
-  "port-version": 3,
+  "port-version": 4,
   "description": "(very) lightweight version of Jinja2 for C++, Lightweight templating engine for C++, based on Jinja2.",
   "homepage": "https://github.com/hughperkins/Jinja2CppLight",
   "supports": "!uwp",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 585e4be216..d0519b1e87 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -269,9 +269,6 @@ jaeger-client-cpp:x64-android=fail
 jemalloc:arm-neon-android=fail
 jemalloc:arm64-android=fail
 jemalloc:x64-android=fail
-jinja2cpplight:arm-neon-android=fail
-jinja2cpplight:arm64-android=fail
-jinja2cpplight:x64-android=fail
 juce:arm-neon-android=fail # needs android-29
 juce:arm64-android=fail
 juce:arm64-linux=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index a16fb97252..5c6e533dc3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4150,7 +4150,7 @@
     },
     "jinja2cpplight": {
       "baseline": "2018-05-08",
-      "port-version": 3
+      "port-version": 4
     },
     "jkqtplotter": {
       "baseline": "2023-10-24",
diff --git a/versions/j-/jinja2cpplight.json b/versions/j-/jinja2cpplight.json
index 596f9a1733..e74f90c7ca 100644
--- a/versions/j-/jinja2cpplight.json
+++ b/versions/j-/jinja2cpplight.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4ff21692b1bbadf5dfad115b95df6e5bea666e5b",
+      "version-date": "2018-05-08",
+      "port-version": 4
+    },
     {
       "git-tree": "a57eb0a010f89aa5d43a4aba792c4d25dca5af8e",
       "version-date": "2018-05-08",