diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf40855245a7d..868f685d35be2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs:
           - name: x86_64-gnu-llvm-10
             os: ubuntu-latest
             env: {}
-          - name: bpfel-unknown-unknown
+          - name: sbf-solana-solana
             os: ubuntu-latest
             env: {}
     timeout-minutes: 600
@@ -166,7 +166,7 @@ jobs:
           - name: x86_64-gnu-llvm-10
             os: ubuntu-latest
             env: {}
-          - name: bpfel-unknown-unknown
+          - name: sbf-solana-solana
             os: ubuntu-latest
             env: {}
     timeout-minutes: 600
diff --git a/build.sh b/build.sh
index 13ad72449caa6..03051d7a23c4a 100755
--- a/build.sh
+++ b/build.sh
@@ -19,4 +19,4 @@ esac
 if [ "$1" == "--llvm" ]; then
     rm -f build/${HOST_TRIPLE}/llvm/llvm-finished-building;
 fi
-./x.py build --stage 1 --target ${HOST_TRIPLE},bpfel-unknown-unknown
+./x.py build --stage 1 --target ${HOST_TRIPLE},bpfel-unknown-unknown,sbf-solana-solana
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
index 900aeb77bfc6f..b77c9c6e57cd7 100644
--- a/library/core/tests/lib.rs
+++ b/library/core/tests/lib.rs
@@ -72,14 +72,14 @@
 #![feature(unzip_option)]
 #![deny(unsafe_op_in_unsafe_fn)]
 
-#[cfg(not(target_arch = "bpf"))]
+#[cfg(not(any(target_arch = "bpf", target_arch = "sbf")))]
 extern crate test;
 
 mod alloc;
 mod any;
 mod array;
 mod ascii;
-#[cfg(not(target_arch = "bpf"))]
+#[cfg(not(any(target_arch = "bpf", target_arch = "sbf")))]
 mod atomic;
 mod bool;
 mod cell;
diff --git a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
index 63283b6f374e6..dcfb4f097d08f 100644
--- a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
@@ -140,7 +140,7 @@ ENV TARGETS=$TARGETS,armv7r-none-eabi
 ENV TARGETS=$TARGETS,armv7r-none-eabihf
 ENV TARGETS=$TARGETS,thumbv7neon-unknown-linux-gnueabihf
 ENV TARGETS=$TARGETS,armv7a-none-eabi
-ENV TARGETS=$TARGETS,bpfel-unknown-unknown
+ENV TARGETS=$TARGETS,sbf-solana-solana
 
 # riscv targets currently do not need a C compiler, as compiler_builtins
 # doesn't currently have it enabled, and the riscv gcc compiler is not
diff --git a/src/ci/docker/host-x86_64/bpfel-unknown-unknown/Dockerfile b/src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile
similarity index 88%
rename from src/ci/docker/host-x86_64/bpfel-unknown-unknown/Dockerfile
rename to src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile
index 5657e09274db9..fcd40a7607935 100644
--- a/src/ci/docker/host-x86_64/bpfel-unknown-unknown/Dockerfile
+++ b/src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile
@@ -32,7 +32,8 @@ ENV RUST_CONFIGURE_ARGS \
     --set llvm.clang
 
 ENV SCRIPT CARGO_TARGET_BPFEL_UNKNOWN_UNKNOWN_RUNNER=\"cargo-run-bpf-tests --heap-size 104857600\" \
+    CARGO_TARGET_SBF_SOLANA_SOLANA_RUNNER=\"cargo-run-bpf-tests --heap-size 104857600\" \
     LLVM_HOME=/checkout/obj/build/x86_64-unknown-linux-gnu/llvm \
     PATH="${HOME}/.cargo/bin:${PATH}" \
-    python3 /checkout/x.py --stage 1 test --host='' --target bpfel-unknown-unknown \
+    python3 /checkout/x.py --stage 1 test --host='' --target bpfel-unknown-unknown,sbf-solana-solana \
     library/core
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index a5295a138f6b1..e908f2f53f61c 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -293,7 +293,7 @@ jobs:
           - name: x86_64-gnu-llvm-10
             <<: *job-linux-xl
 
-          - name: bpfel-unknown-unknown
+          - name: sbf-solana-solana
             <<: *job-linux-xl
 
   push:
@@ -311,7 +311,7 @@ jobs:
           - name: x86_64-gnu-llvm-10
             <<: *job-linux-xl
 
-          - name: bpfel-unknown-unknown
+          - name: sbf-solana-solana
             <<: *job-linux-xl
 
   auto: