diff --git a/doc/tikz-trackschematic-documentation.sty b/doc/tikz-trackschematic-documentation.sty
index d8564b8..b08f995 100644
--- a/doc/tikz-trackschematic-documentation.sty
+++ b/doc/tikz-trackschematic-documentation.sty
@@ -80,7 +80,10 @@
 }%
 
 \RequirePackage{longtable,tikz,siunitx,adjustbox,rotating}
-\sisetup{math-rm=\mathsf}
+\sisetup{
+  text-family-to-math = true,
+  text-series-to-math = true
+}
 
 \IfFileExists{tikz-trackschematic-dev.sty}{%
   \RequirePackage[dev]{tikz-trackschematic}%
diff --git a/test/measure.tikz b/test/measure.tikz
index 7ff6533..7a16a04 100644
--- a/test/measure.tikz
+++ b/test/measure.tikz
@@ -23,10 +23,10 @@
 }
 
 \trackdistance between (3,-1) and (X1-2) label (4,50);
-\trackdistance between (X1-2) and (X2-3) label (\SI[math-rm=\mathsf]{6,50}{\metre});
+\trackdistance between (X1-2) and (X2-3) label (\sffamily \SI{6,50}{\metre});
 \trackdistance between (X1-4) and (X2-4) label (5,50);
 
 \tikzset{hectometer base={(A3)},orientation=right};
-\hectometer[] at (X2-1) mileage (\SI[math-rm=\mathsf]{6,505}{\kilo\metre});
+\hectometer[] at (X2-1) mileage (\sffamily \SI{6,505}{\kilo\metre});
 \hectometer[shift label={(0.3,-1)}] at (X2-2) mileage (name);
 % \measureline between (a) and (b);
\ No newline at end of file
diff --git a/test/test.pdf b/test/test.pdf
index 7852db0..463b5b5 100644
Binary files a/test/test.pdf and b/test/test.pdf differ
diff --git a/test/test.tex b/test/test.tex
index e958f5d..cca6405 100644
--- a/test/test.tex
+++ b/test/test.tex
@@ -6,6 +6,10 @@
 \documentclass[border=2]{standalone}
 
 \usepackage{siunitx}
+\sisetup{
+  text-family-to-math = true,
+  text-series-to-math = true
+}
 \usepackage[prefix=]{xcolor-solarized}
 
 \usepackage[dev]{tikz-trackschematic}