diff --git a/sim/kelvin_top.cc b/sim/kelvin_top.cc
index 61ea668..1deb21c 100644
--- a/sim/kelvin_top.cc
+++ b/sim/kelvin_top.cc
@@ -117,12 +117,6 @@
     (void)state_->AddRegisterAlias<mpact::sim::riscv::RV32Register>(
         reg_name, mpact::sim::riscv::kXRegisterAliases[i]);
   }
-  for (int i = 0; i < 32; i++) {
-    reg_name = absl::StrCat(sim::KelvinState::kFregPrefix, i);
-    (void)state_->AddRegister<mpact::sim::riscv::RVFpRegister>(reg_name);
-    (void)state_->AddRegisterAlias<mpact::sim::riscv::RVFpRegister>(
-        reg_name, mpact::sim::riscv::kFRegisterAliases[i]);
-  }
 
   semihost_ = new mpact::sim::riscv::RiscVArmSemihost(
       mpact::sim::riscv::RiscVArmSemihost::BitWidth::kWord32, memory_, memory_);
diff --git a/sim/test/BUILD b/sim/test/BUILD
index 5ea7564..9dbc184 100644
--- a/sim/test/BUILD
+++ b/sim/test/BUILD
@@ -68,10 +68,12 @@
         "testfiles/rv32uf_fadd.elf",
     ],
     deps = [
+        "//sim:kelvin_state",
         "//sim:kelvin_top",
         "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/log:check",
         "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
         "@com_google_mpact-sim//mpact/sim/generic:core",
         "@com_google_mpact-sim//mpact/sim/util/memory",
diff --git a/sim/test/kelvin_top_test.cc b/sim/test/kelvin_top_test.cc
index 84edeb5..2c7b9b7 100644
--- a/sim/test/kelvin_top_test.cc
+++ b/sim/test/kelvin_top_test.cc
@@ -2,12 +2,15 @@
 
 #include <cstdint>
 #include <string>
+#include <tuple>
 
+#include "sim/kelvin_state.h"
 #include "googlemock/include/gmock/gmock.h"
 #include "googletest/include/gtest/gtest.h"
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
 #include "mpact/sim/generic/core_debug_interface.h"
 #include "mpact/sim/util/memory/flat_demand_memory.h"
 #include "mpact/sim/util/program_loader/elf_program_loader.h"
@@ -334,15 +337,6 @@
     word_value = result.value();
     EXPECT_OK(kelvin_top_->WriteRegister(name, word_value));
   }
-  // Test d-names and numbers.
-  uint64_t dword_value;
-  for (int i = 0; i < 32; i++) {
-    std::string name = absl::StrCat("f", i);
-    auto result = kelvin_top_->ReadRegister(name);
-    EXPECT_OK(result.status());
-    dword_value = result.value();
-    EXPECT_OK(kelvin_top_->WriteRegister(name, dword_value));
-  }
   // Not found.
   EXPECT_EQ(kelvin_top_->ReadRegister("x32").status().code(),
             absl::StatusCode::kNotFound);