diff --git a/.github/workflows/internal-testsuite.yml b/.github/workflows/internal-testsuite.yml
index 6eb4730da0..6e6abc8c79 100644
--- a/.github/workflows/internal-testsuite.yml
+++ b/.github/workflows/internal-testsuite.yml
@@ -39,7 +39,7 @@ jobs:
           ~/.rustup/toolchains
           ~/.rustup/update-hashes
           ~/.rustup/settings.toml
-        key: ${{ runner.os }}-rust-toolchain-${{ hashFiles('rust-toolchain') }}
+        key: ${{ runner.os }}-rust-toolchain-${{ hashFiles('**/*rust-toolchain.toml') }}
 
     - name: Cache Rust artifacts
       uses: actions/cache@v4
diff --git a/analysis/tests/.gitignore b/analysis/tests/.gitignore
index a4e6bcce61..d64bc9932c 100644
--- a/analysis/tests/.gitignore
+++ b/analysis/tests/.gitignore
@@ -1,5 +1,6 @@
 *.bc
-rust-toolchain
+# Sometimes generated by c2rust
+rust-toolchain.toml
 
 instrument.out.log
 instrument.err.jsonl
diff --git a/c2rust-transpile/src/build_files/generated-rust-toolchain.toml b/c2rust-transpile/src/build_files/generated-rust-toolchain.toml
new file mode 100644
index 0000000000..7ce24e7122
--- /dev/null
+++ b/c2rust-transpile/src/build_files/generated-rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2022-08-08"
+components = ["rustfmt"]
diff --git a/c2rust-transpile/src/build_files/mod.rs b/c2rust-transpile/src/build_files/mod.rs
index 2f9dea8afe..a8ea809faf 100644
--- a/c2rust-transpile/src/build_files/mod.rs
+++ b/c2rust-transpile/src/build_files/mod.rs
@@ -260,7 +260,7 @@ fn emit_lib_rs(
 /// on a nightly toolchain until the `c_variadics` feature is stable.
 fn emit_rust_toolchain(tcfg: &TranspilerConfig, build_dir: &Path) {
     let output_path = build_dir.join("rust-toolchain.toml");
-    let output = include_str!("../../rust-toolchain.toml").to_string();
+    let output = include_str!("generated-rust-toolchain.toml").to_string();
     maybe_write_to_file(&output_path, output, tcfg.overwrite_existing);
 }
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 8cd899005b..0b508a986c 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
 channel = "nightly-2022-08-08"
-components = ["rustfmt-preview", "rustc-dev", "rust-src", "miri", "rust-analyzer"]
+components = ["rustfmt", "rustc-dev", "rust-src", "miri", "rust-analyzer"]
diff --git a/tests/.gitignore b/tests/.gitignore
index bdf48c32d9..7719010f6f 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -19,7 +19,7 @@ c2rust-lib.rs
 !build.rs
 
 # sometimes generated by `c2rust`
-rust-toolchain
+rust-toolchain.toml
 
 # sometimes generated by `c2rust`, but only in `src/`
 **/src/Cargo.toml