diff --git a/scss/_popover.scss b/scss/_popover.scss
index a7c9715aa..b4453e9b2 100644
--- a/scss/_popover.scss
+++ b/scss/_popover.scss
@@ -1,8 +1,10 @@
+// stylelint-disable custom-property-empty-line-before
+
 .popover {
   // scss-docs-start popover-css-vars
   --#{$variable-prefix}popover-zindex: #{$zindex-popover};
   --#{$variable-prefix}popover-max-width: #{$popover-max-width};
-  --#{$variable-prefix}popover-font-size: #{$popover-font-size};
+  @include rfs($popover-font-size, --#{$variable-prefix}popover-font-size);
   --#{$variable-prefix}popover-bg: #{$popover-bg};
   --#{$variable-prefix}popover-border-width: #{$popover-border-width};
   --#{$variable-prefix}popover-border-color: #{$popover-border-color};
diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss
index 6db356ea8..bcae2eb00 100644
--- a/scss/_tooltip.scss
+++ b/scss/_tooltip.scss
@@ -1,3 +1,5 @@
+// stylelint-disable custom-property-empty-line-before
+
 // Base class
 .tooltip {
   // scss-docs-start tooltip-css-vars
@@ -5,7 +7,7 @@
   --#{$variable-prefix}tooltip-max-width: #{$tooltip-max-width};
   --#{$variable-prefix}tooltip-padding: #{$tooltip-padding-y} #{$tooltip-padding-x};
   --#{$variable-prefix}tooltip-margin: #{$tooltip-margin};
-  --#{$variable-prefix}tooltip-font-size: #{$tooltip-font-size};
+  @include rfs($tooltip-font-size, --#{$variable-prefix}tooltip-font-size);
   --#{$variable-prefix}tooltip-color: #{$tooltip-color};
   --#{$variable-prefix}tooltip-bg: #{$tooltip-bg};
   --#{$variable-prefix}tooltip-border-radius: #{$tooltip-border-radius};