diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 372fa86d3..8d9f56abb 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1431,7 +1431,6 @@ class SkinMinerva extends SkinTemplate {
 			'skins.minerva.content.styles',
 			'skins.minerva.content.styles.images',
 			'mediawiki.hlist',
-			'skins.minerva.tablet.styles',
 			'mediawiki.ui.icon',
 			'mediawiki.ui.button',
 			'skins.minerva.icons.images',
diff --git a/resources/skins.minerva.tablet.styles/common.less b/resources/skins.minerva.content.styles/tablet/common.less
similarity index 96%
rename from resources/skins.minerva.tablet.styles/common.less
rename to resources/skins.minerva.content.styles/tablet/common.less
index 5a2de3ea3..2827d04bf 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.content.styles/tablet/common.less
@@ -2,8 +2,8 @@
 A file for css that optimises the Minerva skin on larger devices.
 */
 
-@import '../../minerva.less/minerva.variables';
-@import '../../minerva.less/minerva.mixins';
+@import '../../../minerva.less/minerva.variables';
+@import '../../../minerva.less/minerva.mixins';
 @paddingVertical: 1.4em;
 
 @media screen and ( min-width: @width-breakpoint-tablet ) {
diff --git a/resources/skins.minerva.tablet.styles/hacks.less b/resources/skins.minerva.content.styles/tablet/hacks.less
similarity index 89%
rename from resources/skins.minerva.tablet.styles/hacks.less
rename to resources/skins.minerva.content.styles/tablet/hacks.less
index c7e8b609c..87dab96d6 100644
--- a/resources/skins.minerva.tablet.styles/hacks.less
+++ b/resources/skins.minerva.content.styles/tablet/hacks.less
@@ -8,8 +8,8 @@ https://www.mediawiki.org/wiki/Requests_for_comment/Allow_styling_in_templates
 FIXME: Review all of these hacks to see if they still apply.
 */
 
-@import '../../minerva.less/minerva.variables';
-@import '../../minerva.less/minerva.mixins';
+@import '../../../minerva.less/minerva.variables';
+@import '../../../minerva.less/minerva.mixins';
 
 /* Tablet specific styling */
 @media all and ( min-width: @width-breakpoint-tablet ) {
diff --git a/resources/skins.minerva.tablet.styles/styles.less b/resources/skins.minerva.content.styles/tablet/styles.less
similarity index 100%
rename from resources/skins.minerva.tablet.styles/styles.less
rename to resources/skins.minerva.content.styles/tablet/styles.less
diff --git a/skin.json b/skin.json
index 65032e87b..6e7136f44 100644
--- a/skin.json
+++ b/skin.json
@@ -185,7 +185,8 @@
 				"desktop"
 			],
 			"styles": [
-				"resources/skins.minerva.content.styles/styles.less"
+				"resources/skins.minerva.content.styles/styles.less",
+				"resources/skins.minerva.content.styles/tablet/styles.less"
 			]
 		},
 		"skins.minerva.content.styles.images": {
@@ -203,16 +204,6 @@
 				}
 			}
 		},
-		"skins.minerva.tablet.styles": {
-			"class": "MediaWiki\\Minerva\\ResourceLoaderLessVarFileModule",
-			"targets": [
-				"mobile",
-				"desktop"
-			],
-			"styles": [
-				"resources/skins.minerva.tablet.styles/styles.less"
-			]
-		},
 		"skins.minerva.icons.loggedin": {
 			"class": "ResourceLoaderImageModule",
 			"selector": ".mw-ui-icon-minerva-{name}:before",