diff --git a/lib/loader.js b/lib/loader.js
index 1448b59d2..1feffb83c 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -145,7 +145,7 @@ module.exports = function (content) {
           return defaultLoaders.html + '!' + rewriter + templateLoader + '?raw&engine=' + lang + '!'
         case 'style':
           loader = addCssModulesToLoader(defaultLoaders.css, part, index)
-          return loader + '!' + rewriter + lang + '!'
+          return loader + '!' + rewriter + lang + '-loader' + '!'
         case 'script':
           return injectString + lang + '!'
       }
diff --git a/test/test.js b/test/test.js
index 4424567eb..cffa42686 100644
--- a/test/test.js
+++ b/test/test.js
@@ -306,7 +306,7 @@ describe('vue-loader', function () {
 
       // get local class name
       var className = module.computed.style().red
-      expect(className).to.match(/^_/)
+      expect(className).to.match(/_/)
 
       // class name in style
       var style = [].slice.call(window.document.querySelectorAll('style')).map(function (style) {
@@ -323,7 +323,7 @@ describe('vue-loader', function () {
 
       // default module + pre-processor + scoped
       var anotherClassName = module.computed.$style().red
-      expect(anotherClassName).to.match(/^_/).and.not.equal(className)
+      expect(anotherClassName).to.match(/_/).and.not.equal(className)
       var id = '_v-' + hash(require.resolve('./fixtures/css-modules.vue'))
       expect(style).to.contain('.' + anotherClassName + '[' + id + ']')