diff --git a/src/mm/address_space.rs b/src/mm/address_space.rs
index 84fb9b7c81..fb1231af27 100644
--- a/src/mm/address_space.rs
+++ b/src/mm/address_space.rs
@@ -168,3 +168,65 @@ pub const SVSM_PERTASK_DYNAMIC_MEMORY: VirtAddr = SVSM_PERTASK_BASE;
 /// Task stack
 pub const SVSM_PERTASK_STACK_BASE: VirtAddr = SVSM_PERTASK_BASE.const_add(0xffffff0000);
 pub const SVSM_PERTASK_STACK_TOP: VirtAddr = SVSM_PERTASK_STACK_BASE.const_add(0x10000);
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn init_km_testing() {
+        KERNEL_MAPPING
+            .init(&KernelMapping {
+                virt_start: VirtAddr::new(0x1000),
+                virt_end: VirtAddr::new(0x2000),
+                phys_start: PhysAddr::new(0x3000),
+            })
+            .unwrap();
+    }
+
+    #[test]
+    fn test_init_kernel_mapping_info() {
+        init_km_testing();
+
+        let km = &KERNEL_MAPPING;
+
+        assert_eq!(km.virt_start, VirtAddr::new(0x1000));
+        assert_eq!(km.virt_end, VirtAddr::new(0x2000));
+        assert_eq!(km.phys_start, PhysAddr::new(0x3000));
+    }
+
+    #[test]
+    #[cfg(target_os = "none")]
+    fn test_virt_to_phys() {
+        let vaddr = VirtAddr::new(0x1500);
+        let paddr = virt_to_phys(vaddr);
+
+        assert_eq!(paddr, PhysAddr::new(0x4500));
+    }
+
+    #[test]
+    #[cfg(not(target_os = "none"))]
+    fn test_virt_to_phys() {
+        let vaddr = VirtAddr::new(0x1500);
+        let paddr = virt_to_phys(vaddr);
+
+        assert_eq!(paddr, PhysAddr::new(0x1500));
+    }
+
+    #[test]
+    #[cfg(target_os = "none")]
+    fn test_phys_to_virt() {
+        let paddr = PhysAddr::new(0x4500);
+        let vaddr = phys_to_virt(paddr);
+
+        assert_eq!(vaddr, VirtAddr::new(0x1500));
+    }
+
+    #[test]
+    #[cfg(not(target_os = "none"))]
+    fn test_phys_to_virt() {
+        let paddr = PhysAddr::new(0x4500);
+        let vaddr = phys_to_virt(paddr);
+
+        assert_eq!(vaddr, VirtAddr::new(0x4500));
+    }
+}
diff --git a/src/mm/guestmem.rs b/src/mm/guestmem.rs
index e559319423..109d0ba480 100644
--- a/src/mm/guestmem.rs
+++ b/src/mm/guestmem.rs
@@ -221,3 +221,31 @@ impl<T: Sized + Copy> GuestPtr<T> {
         unsafe { GuestPtr::from_ptr(self.ptr.offset(count)) }
     }
 }
+
+mod tests {
+
+    #[test]
+    fn test_read_u8_valid_address() {
+        use crate::mm::guestmem::*;
+        // Create a region to read from
+        let test_buffer: [u8; 6] = [0; 6];
+        let test_address = &test_buffer as *const u8 as usize;
+
+        let result = read_u8(VirtAddr::new(test_address)).unwrap();
+
+        assert_eq!(result, test_buffer[0]);
+    }
+
+    #[test]
+    fn test_write_u8_valid_address() {
+        use crate::mm::guestmem::*;
+        // Create a mutable region we can write into
+        let mut test_buffer: [u8; 6] = [0; 6];
+        let test_address = &mut test_buffer as *mut u8 as usize;
+        let data_to_write = 0x42;
+
+        write_u8(VirtAddr::new(test_address), data_to_write).unwrap();
+
+        assert_eq!(test_buffer[0], data_to_write);
+    }
+}
diff --git a/src/mm/memory.rs b/src/mm/memory.rs
index 34c5f9b0b7..50e5abf2d6 100644
--- a/src/mm/memory.rs
+++ b/src/mm/memory.rs
@@ -107,3 +107,24 @@ pub fn writable_phys_addr(paddr: PhysAddr) -> bool {
 
     valid_phys_address(paddr)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::address::PhysAddr;
+
+    #[test]
+    fn test_valid_phys_address() {
+        let region = MemoryRegion {
+            start: 0x1000,
+            end: 0x2000,
+        };
+
+        MEMORY_MAP.lock_write().push(region);
+
+        // Inside the region
+        assert!(valid_phys_address(PhysAddr::new(0x1500)));
+        // Outside the region
+        assert!(!valid_phys_address(PhysAddr::new(0x3000)));
+    }
+}