diff --git a/spec/runner.html b/spec/runner.html
index 1379f03e..d3c6809a 100644
--- a/spec/runner.html
+++ b/spec/runner.html
@@ -44,9 +44,9 @@
 
 	<!-- /layer -->
 	<script type="text/javascript" src="suites/layer/TileLayerSpec.js"></script>
-	<script type="text/javascript" src="suites/layer/marker/CircleMarkerSpec.js"></script>
-	<script type="text/javascript" src="suites/layer/vector/PolylineGeometrySpec.js"></script>
 	<script type="text/javascript" src="suites/layer/vector/CircleSpec.js"></script>
+	<script type="text/javascript" src="suites/layer/vector/CircleMarkerSpec.js"></script>
+	<script type="text/javascript" src="suites/layer/vector/PolylineGeometrySpec.js"></script>
 
 	<!-- /map -->
 	<script type="text/javascript" src="suites/map/MapSpec.js"></script>
diff --git a/spec/suites/layer/marker/CircleMarkerSpec.js b/spec/suites/layer/vector/CircleMarkerSpec.js
similarity index 61%
rename from spec/suites/layer/marker/CircleMarkerSpec.js
rename to spec/suites/layer/vector/CircleMarkerSpec.js
index 73099188..8a94783a 100644
--- a/spec/suites/layer/marker/CircleMarkerSpec.js
+++ b/spec/suites/layer/vector/CircleMarkerSpec.js
@@ -3,12 +3,11 @@
 		var map;
 		beforeEach(function() {
 			map = L.map(document.createElement('div'));
+			map.setView([0, 0], 1);
 		});
 		describe("when a CircleMarker is added to the map ", function() {
 			describe("with a radius set as an option", function() {
 				it("should take that radius", function() {
-					map.setView([0, 0], 1);
-
 					var marker = L.circleMarker([0, 0], { radius: 20 }).addTo(map);
 
 					expect(marker._radius).toBe(20);
@@ -17,8 +16,6 @@
 
 			describe("and radius is set before adding it", function () {
 				it("should take that radius", function () {
-					map.setView([0, 0], 1);
-
 					var marker = L.circleMarker([0, 0], { radius: 20 });
 					marker.setRadius(15);
 					marker.addTo(map);
@@ -28,14 +25,29 @@
 
 			describe("and radius is set after adding it", function () {
 				it("should take that radius", function () {
-					map.setView([0, 0], 1);
-
 					var marker = L.circleMarker([0, 0], { radius: 20 });
 					marker.addTo(map);
 					marker.setRadius(15);
 					expect(marker._radius).toBe(15);
 				});
 			});
+
+			describe("and setStyle is used to change the radius after adding", function () {
+				it("should take the given radius", function() {
+					var marker = L.circleMarker([0, 0], { radius: 20 });
+					marker.addTo(map);
+					marker.setStyle({ radius: 15 });
+					expect(marker._radius).toBe(15);
+				});
+			});
+			describe("and setStyle is used to change the radius before adding", function () {
+				it("should take the given radius", function () {
+					var marker = L.circleMarker([0, 0], { radius: 20 });
+					marker.setStyle({ radius: 15 });
+					marker.addTo(map);
+					expect(marker._radius).toBe(15);
+				});
+			});
 		});
 	});
 });
\ No newline at end of file
diff --git a/spec/testacular.conf.js b/spec/testacular.conf.js
index f8665cba..e7a69001 100644
--- a/spec/testacular.conf.js
+++ b/spec/testacular.conf.js
@@ -33,9 +33,9 @@ files = [].concat([
 		"suites/dom/DomEventSpec.js",
 		"suites/dom/DomUtilSpec.js",
 		"suites/layer/TileLayerSpec.js",
-		"suites/layer/marker/CircleMarkerSpec.js",
-		"suites/layer/vector/PolylineGeometrySpec.js",
 		"suites/layer/vector/CircleSpec.js",
+		"suites/layer/vector/CircleMarkerSpec.js",
+		"suites/layer/vector/PolylineGeometrySpec.js",
 		"suites/map/MapSpec.js"
 	]);