diff --git a/src/docbuilder/limits.rs b/src/docbuilder/limits.rs
index cd015189e..8a15e7817 100644
--- a/src/docbuilder/limits.rs
+++ b/src/docbuilder/limits.rs
@@ -3,6 +3,7 @@ use postgres::Connection;
 use std::collections::BTreeMap;
 use std::time::Duration;
 
+#[derive(Debug, PartialEq)]
 pub(crate) struct Limits {
     memory: usize,
     targets: usize,
@@ -68,16 +69,14 @@ impl Limits {
     }
 
     pub(crate) fn for_website(&self) -> BTreeMap<String, String> {
-        let time_scale = |v| scale(v, 60, &["seconds", "minutes", "hours"]);
-        let size_scale = |v| scale(v, 1024, &["bytes", "KB", "MB", "GB"]);
 
         let mut res = BTreeMap::new();
-        res.insert("Available RAM".into(), size_scale(self.memory));
+        res.insert("Available RAM".into(), SIZE_SCALE(self.memory));
         res.insert(
             "Maximum rustdoc execution time".into(),
-            time_scale(self.timeout.as_secs() as usize),
+            TIME_SCALE(self.timeout.as_secs() as usize),
         );
-        res.insert("Maximum size of a build log".into(), size_scale(self.max_log_size));
+        res.insert("Maximum size of a build log".into(), SIZE_SCALE(self.max_log_size));
         if self.networking {
             res.insert("Network access".into(), "allowed".into());
         } else {
@@ -88,15 +87,102 @@ impl Limits {
     }
 }
 
-fn scale(mut value: usize, interval: usize, labels: &[&str]) -> String {
+const TIME_SCALE: fn(usize) -> String = |v| scale(v, 60, &["seconds", "minutes", "hours"]);
+const SIZE_SCALE: fn(usize) -> String = |v| scale(v, 1024, &["bytes", "KB", "MB", "GB"]);
+
+fn scale(value: usize, interval: usize, labels: &[&str]) -> String {
+    let (mut value, interval) = (value as f64, interval as f64);
     let mut chosen_label = &labels[0];
     for label in &labels[1..] {
-        if (value as f64) / (interval as f64) >= 1.0 {
+        if value / interval >= 1.0 {
             chosen_label = label;
             value = value / interval;
         } else {
             break;
         }
     }
+    // 2.x
+    let mut value = format!("{:.1}", value);
+    // 2.0 -> 2
+    if value.ends_with(".0") {
+        value.truncate(value.len() - 2);
+    }
     format!("{} {}", value, chosen_label)
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::*;
+    #[test]
+    fn retrieve_limits() {
+        wrapper(|env| {
+            let db = env.db();
+
+            let krate = "hexponent";
+            // limits work if no crate has limits set
+            let hexponent = Limits::for_crate(&db.conn(), krate)?;
+            assert_eq!(hexponent, Limits::default());
+
+            db.conn().query("INSERT INTO sandbox_overrides (crate_name, max_targets) VALUES ($1, 15)", &[&krate])?;
+            // limits work if crate has limits set
+            let hexponent = Limits::for_crate(&db.conn(), krate)?;
+            assert_eq!(hexponent, Limits { targets: 15, ..Limits::default() });
+
+            // all limits work
+            let krate = "regex";
+            let limits = Limits {
+                memory: 100_000,
+                timeout: Duration::from_secs(300),
+                targets: 1,
+                ..Limits::default()
+            };
+            db.conn().query("INSERT INTO sandbox_overrides (crate_name, max_memory_bytes, timeout_seconds, max_targets)
+                                    VALUES ($1, $2, $3, $4)",
+                                    &[&krate, &(limits.memory as i64), &(limits.timeout.as_secs() as i32), &(limits.targets as i32)])?;
+            assert_eq!(limits, Limits::for_crate(&db.conn(), krate)?);
+            Ok(())
+        });
+    }
+    #[test]
+    fn display_limits() {
+        let limits = Limits {
+            memory: 102400,
+            timeout: Duration::from_secs(300),
+            targets: 1,
+            ..Limits::default()
+        };
+        let display = limits.for_website();
+        assert_eq!(display.get("Network access".into()), Some(&"blocked".into()));
+        assert_eq!(display.get("Maximum size of a build log".into()), Some(&"100 KB".into()));
+        assert_eq!(display.get("Maximum number of build targets".into()), Some(&limits.targets.to_string()));
+        assert_eq!(display.get("Maximum rustdoc execution time".into()), Some(&"5 minutes".into()));
+        assert_eq!(display.get("Available RAM".into()), Some(&"100 KB".into()));
+    }
+    #[test]
+    fn scale_limits() {
+        // time
+        assert_eq!(TIME_SCALE(300), "5 minutes");
+        assert_eq!(TIME_SCALE(1), "1 seconds");
+        assert_eq!(TIME_SCALE(7200), "2 hours");
+
+        // size
+        assert_eq!(SIZE_SCALE(1), "1 bytes");
+        assert_eq!(SIZE_SCALE(100), "100 bytes");
+        assert_eq!(SIZE_SCALE(1024), "1 KB");
+        assert_eq!(SIZE_SCALE(10240), "10 KB");
+        assert_eq!(SIZE_SCALE(1048576), "1 MB");
+        assert_eq!(SIZE_SCALE(10485760), "10 MB");
+        assert_eq!(SIZE_SCALE(1073741824), "1 GB");
+        assert_eq!(SIZE_SCALE(10737418240), "10 GB");
+        assert_eq!(SIZE_SCALE(std::u32::MAX as usize), "4 GB");
+
+        // fractional sizes
+        assert_eq!(TIME_SCALE(90), "1.5 minutes");
+        assert_eq!(TIME_SCALE(5400), "1.5 hours");
+
+        assert_eq!(SIZE_SCALE(1288490189), "1.2 GB");
+        assert_eq!(SIZE_SCALE(3758096384), "3.5 GB");
+        assert_eq!(SIZE_SCALE(1048051712), "999.5 MB");
+    }
+}