diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6cb911a41..47fca6651 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -368,39 +368,3 @@ workflows:
     jobs:
       - trigger-downstream-ci:
           context: openquantumsafe
-
-  weekly:
-    jobs:
-      - linux_oqs:
-          name: constant-time-x64
-          context: openquantumsafe
-          CONTAINER: openquantumsafe/ci-ubuntu-bionic-x86_64:latest
-          CMAKE_ARGS: -DOQS_OPT_TARGET=generic -DCMAKE_BUILD_TYPE=Debug -DOQS_ENABLE_TEST_CONSTANT_TIME=ON
-          PYTEST_ARGS: --numprocesses=auto -k 'test_constant_time'
-          SKIP_ALGS: 'SPHINCS\+-SHA*,Rainbow-V-Compressed,Classic-McEliece-6(.)*'
-      - linux_oqs:
-          name: constant-time-x64-extensions
-          context: openquantumsafe
-          CONTAINER: openquantumsafe/ci-ubuntu-bionic-x86_64:latest
-          # building for haswell to avoid generating instructions that valgrind cannot currently handle
-          # TODO: Re-enable target=auto if/when valgrind supports beyond AVX2:
-          # check: https://valgrind.org/info/platforms.html
-          CMAKE_ARGS: -DOQS_OPT_TARGET=haswell -DCMAKE_BUILD_TYPE=Debug -DOQS_ENABLE_TEST_CONSTANT_TIME=ON
-          PYTEST_ARGS: --numprocesses=auto -k 'test_constant_time'
-          SKIP_ALGS: 'SPHINCS\+-SHA*,Rainbow-V-Compressed,Classic-McEliece-6(.)*'
-      - linux_oqs:
-          name: undefined-sanitizer
-          context: openquantumsafe
-          CONTAINER: openquantumsafe/ci-ubuntu-focal-x86_64:latest
-          CMAKE_ARGS: -DCMAKE_C_COMPILER=clang-9 -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Undefined
-          # Normally the linux tests are run with 35 processes, but that
-          # exhausts memory for this test
-          PYTEST_ARGS: --numprocesses=1
-    # run these jobs unconditionally every Sunday at midnight
-    triggers:
-      - schedule:
-          cron: "10 0 * * 0"
-          filters:
-            branches:
-              only:
-                - main
diff --git a/.dsci.yml b/.dsci.yml
index 4e18e9df0..654808c37 100644
--- a/.dsci.yml
+++ b/.dsci.yml
@@ -1,16 +1,7 @@
 jobs:
-  - name: Check environment
-    cmds:
-      - whoami
-      - pwd
-      - cmake --version
-      - uname -a
-  - name: Building on M1
-    cmds:
-      - mkdir build && cd build && cmake -GNinja .. && ninja
-  - name: Minimal testing on M1
+  - name: Building and minimal testing on M1
     env:
       PYTEST_ARGS: tests/test_code_conventions.py tests/test_kat.py
     cmds:
-      - python3 -m pytest --verbose $PYTEST_ARGS
+      - uname -a && mkdir build && cd build && cmake -GNinja .. && ninja && cd .. && python3 -m pytest --verbose $PYTEST_ARGS
 
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 294b4efa2..dedc097e1 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -16,10 +16,12 @@ jobs:
             container: openquantumsafe/ci-ubuntu-bionic-x86_64:latest
             CMAKE_ARGS: -DOQS_OPT_TARGET=generic -DCMAKE_BUILD_TYPE=Debug -DOQS_ENABLE_TEST_CONSTANT_TIME=ON
             PYTEST_ARGS: --numprocesses=auto -k 'test_constant_time'
+            SKIP_ALGS: 'SPHINCS\+-SHA*,Rainbow-V-Compressed,Classic-McEliece-6(.)*'
           - name: extensions
             container: openquantumsafe/ci-ubuntu-bionic-x86_64:latest
             CMAKE_ARGS: -DOQS_OPT_TARGET=haswell -DCMAKE_BUILD_TYPE=Debug -DOQS_ENABLE_TEST_CONSTANT_TIME=ON
             PYTEST_ARGS: --numprocesses=auto -k 'test_constant_time'
+            SKIP_ALGS: 'SPHINCS\+-SHA*,Rainbow-V-Compressed,Classic-McEliece-6(.)*'
     container:
       image: ${{ matrix.container }}
     steps:
@@ -31,6 +33,6 @@ jobs:
         run: ninja
         working-directory: build
       - name: Run tests
-        timeout-minutes: 600
-        run: mkdir -p tmp && python3 -m pytest --verbose ${{ matrix.PYTEST_ARGS }}
+        timeout-minutes: 360
+        run: mkdir -p tmp && SKIP_ALGS=${{ matrix.SKIP_ALGS }} python3 -m pytest --verbose ${{ matrix.PYTEST_ARGS }}