diff --git a/.github/workflows/github-pull-request-build.yml b/.github/workflows/github-pull-request-build.yml
index 7312b56..e316eb0 100644
--- a/.github/workflows/github-pull-request-build.yml
+++ b/.github/workflows/github-pull-request-build.yml
@@ -18,8 +18,6 @@ jobs:
       - run:  ./linuxBuild.sh
   Build-And-Test-Mac:
     runs-on: [self-hosted, macOS, ARM64]
-    env:
-      LIBSODIUM_FULL_BUILD: 1
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/multiplatform-crypto-libsodium-bindings/build.gradle.kts b/multiplatform-crypto-libsodium-bindings/build.gradle.kts
index 4fbeb9a..2b39ae8 100644
--- a/multiplatform-crypto-libsodium-bindings/build.gradle.kts
+++ b/multiplatform-crypto-libsodium-bindings/build.gradle.kts
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.jetbrains.dokka.Platform
 
 plugins {
     kotlin(PluginsDeps.multiplatform)
@@ -672,15 +671,16 @@ tasks {
 
     }
 
-    if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") {
-        val jvmTest by getting(Test::class) {
-            testLogging {
-                events("PASSED", "FAILED", "SKIPPED")
-                exceptionFormat = TestExceptionFormat.FULL
-                showStandardStreams = true
-                showStackTraces = true
-            }
+    val jvmTest by getting(Test::class) {
+        testLogging {
+            events("PASSED", "FAILED", "SKIPPED")
+            exceptionFormat = TestExceptionFormat.FULL
+            showStandardStreams = true
+            showStackTraces = true
         }
+    }
+
+    if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") {
 
         val linuxX64Test by getting(KotlinNativeTest::class) {
 
diff --git a/sodiumWrapper/makeMacosIosWatchosTvos.sh b/sodiumWrapper/makeMacosIosWatchosTvos.sh
index 1b6ac2f..8a984e9 100755
--- a/sodiumWrapper/makeMacosIosWatchosTvos.sh
+++ b/sodiumWrapper/makeMacosIosWatchosTvos.sh
@@ -1,6 +1,6 @@
 ./configureMacos64.sh
 cd libsodium
-./dist-build/apple-xcframework.sh
+LIBSODIUM_FULL_BUILD=1 ./dist-build/apple-xcframework.sh
 
 mkdir ../static-ios
 mkdir ../static-ios-simulators