diff --git a/lib/less/tree/import.js b/lib/less/tree/import.js
index 2a9512091..427c1095e 100644
--- a/lib/less/tree/import.js
+++ b/lib/less/tree/import.js
@@ -18,12 +18,12 @@ tree.Import = function (path, imports) {
 
     // The '.less' extension is optional
     if (path instanceof tree.Quoted) {
-        this.path = /\.(le?|c)ss$/.test(path.value) ? path.value : path.value + '.less';
+        this.path = /\.(le?|c)ss(\?.*)?$/.test(path.value) ? path.value : path.value + '.less';
     } else {
         this.path = path.value.value || path.value;
     }
 
-    this.css = /css$/.test(this.path);
+    this.css = /css(\?.*)?$/.test(this.path);
 
     // Only pre-compile .less files
     if (! this.css) {
diff --git a/test/css/import.css b/test/css/import.css
index 378beb3b8..320ffeb20 100644
--- a/test/css/import.css
+++ b/test/css/import.css
@@ -1,4 +1,6 @@
 @import "import-test-d.css";
+
+@import url(http://fonts.googleapis.com/css?family=Open+Sans);
 #import {
   color: red;
 }
diff --git a/test/less/import.less b/test/less/import.less
index 08ad52c49..42be3c1e5 100644
--- a/test/less/import.less
+++ b/test/less/import.less
@@ -1,5 +1,6 @@
 @import url("import/import-test-a.less");
 //@import url("import/import-test-a.less");
+@import url(http://fonts.googleapis.com/css?family=Open+Sans);
 
 #import-test {
   .mixin;