diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb6411a85ab..efeefc040f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,15 +96,6 @@ if (TEST_SYSGENID_PATH)
   add_definitions(-DAWSLC_SNAPSAFE_TESTING=1)
   message(STATUS "Setting AWSLC_SYSGENID_PATH=${TEST_SYSGENID_PATH}")
   add_definitions(-DAWSLC_SYSGENID_PATH=\"${TEST_SYSGENID_PATH}\")
-
-  if (SYSGENID_PATH)
-    message(FATAL_ERROR "Cannot set both TEST_SYSGENID_PATH and SYGENID_PATH")
-  endif()
-endif()
-
-if (SYSGENID_PATH)
-  message(STATUS "Setting AWSLC_SYSGENID_PATH=${SYSGENID_PATH}")
-  add_definitions(-DAWSLC_SYSGENID_PATH=\"${SYSGENID_PATH}\")
 endif()
 
 if(ANDROID)
diff --git a/util/all_tests.json b/util/all_tests.json
index 2f3d260980b..12e33589829 100644
--- a/util/all_tests.json
+++ b/util/all_tests.json
@@ -55,8 +55,7 @@
     "comment": "Run snapsafe detection test suite with fork detection disabled and without Intel RDRAND",
     "cmd": ["crypto/crypto_test", "--fork_unsafe_buffering", "--gtest_filter=SnapsafeGenerationTest.*"],
     "env": ["OPENSSL_ia32cap=~0x4000000000000000"],
-    "skip_valgrind": true,
-    "target_arch": "x86"
+    "skip_valgrind": true
   },
   {
     "comment": "Potentially with RDRAND, but not Intel",