diff --git a/CHANGELOG b/CHANGELOG
index 919def48d..a5e4b8b50 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,8 +16,8 @@
   - CPUID for Pentium II will now report stepping 3
     and model 3 which is a minimum requirement for OSes
     to attempt to use SYSENTER/SYSEXIT (joncampbell123)
-  - Added MSRs for SYSENTER/SYSEXIT (joncampbell123)
-  - Implemented Pentium II SYSENTER/SYSEXIT (joncampbell123)
+  - Implemented Pentium II instructions SYSENTER and
+    SYSEXIT, and added MSRs for them. (joncampbell123)
   - 8086 and 80186 CPU types no longer check segment
     limits. (joncampbell123)
   - Add MSR register 0x0000001B to Pentium II
@@ -47,7 +47,7 @@
     J-3100 DCGA, depending on if J-3100 is enabled)
     mode from other video modes. (nanshiki & Wengier)
   - Added support for unit tests based on GoogleTest
-    framework (GTest/GMock) to ensure code stability.
+    framework (gTest/gMock) to ensure code stability.
     Unit tests can be started with command-line option
     -tests in the debug builds. Some unit tests are
     ported from DOSBox Staging. (Wengier)
diff --git a/tests/drives_tests.cpp b/tests/drives_tests.cpp
index f8212b48b..bfd86c191 100644
--- a/tests/drives_tests.cpp
+++ b/tests/drives_tests.cpp
@@ -18,8 +18,6 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#if C_DEBUG
-
 #include "../src/dos/drives.h"
 
 #include <gtest/gtest.h>
@@ -156,4 +154,3 @@ TEST(Set_Label, InvalidCharsEndingDotCD)
 }
 
 } // namespace
-#endif
diff --git a/tests/readme.txt b/tests/readme.txt
index b2e2ed425..ed4f21120 100644
--- a/tests/readme.txt
+++ b/tests/readme.txt
@@ -1,5 +1,5 @@
 Source files in this subdirectory contain unit tests.
-They use GTest and GMock for running unit testing.
+They use gTest and gMock for running unit testing.
 Unit tests can be launched with "dosbox-x -tests".
 Free free to add more unit tests in this directory.
 
@@ -7,3 +7,7 @@ Read Google Test Primer for reference of most available
 features, macros, and guidance about writing unit tests:
 
 https://google.github.io/googletest/primer.html
+
+More information about gMock can be found at:
+
+https://google.github.io/googletest/gmock_for_dummies.html
diff --git a/tests/shell_cmds_tests.cpp b/tests/shell_cmds_tests.cpp
index a6f8a5abd..8d11ef1ef 100644
--- a/tests/shell_cmds_tests.cpp
+++ b/tests/shell_cmds_tests.cpp
@@ -18,8 +18,6 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#if C_DEBUG
-
 #include "shell.h"
 
 #include <string>
@@ -175,4 +173,3 @@ TEST_F(DOS_Shell_CMDSTest, CMD_ECHO_space_handling)
 }
 
 } // namespace
-#endif