diff --git a/buildspec.yaml b/buildspec.yaml
index a138100830572fbf1f8b9cb9412e3b3be4f386db..415610b4aeb02b300a42a0526a597a9e0abf8e89 100644
--- a/buildspec.yaml
+++ b/buildspec.yaml
@@ -9,7 +9,7 @@ phases:
     commands:
       - g++ --version
       - clang++ --version
-      - icpc --version
+      # - icpc --version # Intel CC on build machine expired...
   build:
     commands:
       - make
diff --git a/test/test.sh b/test/test.sh
index b3f664a71caabf4a502cd659a3a2fa3fde5db304..3c15f74059a60298348b06bd66ae560cf1d7bc60 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 
-for cxx in g++ clang++ icpc
+if icpc --version; then
+    compilers=(g++ clang++ icpc)
+else
+    compilers=(g++ clang++)
+fi
+
+for cxx in $compilers
 do
     for std in 14 17
     do