diff --git a/specs/bubble/Bubble.spec.js b/specs/bubble/Bubble.spec.js
index 03c5fea72..c621534e6 100644
--- a/specs/bubble/Bubble.spec.js
+++ b/specs/bubble/Bubble.spec.js
@@ -44,7 +44,7 @@ describe('<Bubble />', function () {
                 expect(circles.length).toBe(11);
 
                 done();
-            }, 4000);
+            }, 400);
         })
     });
 });
diff --git a/specs/bubble/BubbleD3.spec.js b/specs/bubble/BubbleD3.spec.js
index 56391b940..edf8eb45c 100644
--- a/specs/bubble/BubbleD3.spec.js
+++ b/specs/bubble/BubbleD3.spec.js
@@ -44,7 +44,7 @@ describe('<BubbleD3 />', function () {
                 expect(circles.length).toBe(11);
 
                 done();
-            }, 4000);
+            }, 400);
         })
     });
 });
diff --git a/specs/calendar/CalendarD3.spec.js b/specs/calendar/CalendarD3.spec.js
new file mode 100644
index 000000000..17cc259f9
--- /dev/null
+++ b/specs/calendar/CalendarD3.spec.js
@@ -0,0 +1,110 @@
+/*
+ * This file is part of the nivo library.
+ *
+ * (c) Raphaël Benitte
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+'use strict';
+
+import expect, { spyOn }    from 'expect';
+import React, { Component } from 'react';
+import { render }           from 'react-dom';
+import { CalendarD3 }       from '../../src/';
+
+
+describe('<CalendarD3 />', function () {
+    this.timeout(10000);
+
+    let node;
+    beforeEach(() => {
+        node = document.createElement('div');
+        document.body.appendChild(node);
+    });
+
+    afterEach(() => {
+        document.body.removeChild(node);
+    });
+
+    it('should render all years days', done => {
+        render((
+            <CalendarD3
+                width={700} height={400}
+                margin={{ top: 30, right: 30, bottom: 30, left: 30 }}
+                from={new Date(2013, 3, 1)} to={new Date(2014, 7, 12)}
+                transitionDuration={0}
+                transitionStaggering={0}
+            />
+        ), node, () => {
+            setTimeout(() => {
+                const days = node.getElementsByClassName('nivo_calendar_day');
+                expect(days).toNotBe(null);
+                expect(days.length).toBe(365 * 2);
+
+                done();
+            }, 400);
+        })
+    });
+
+    it('should render all years months', done => {
+        render((
+            <CalendarD3
+                width={700} height={400}
+                margin={{ top: 30, right: 30, bottom: 30, left: 30 }}
+                from={new Date(2013, 3, 1)} to={new Date(2014, 7, 12)}
+                transitionDuration={0}
+                transitionStaggering={0}
+            />
+        ), node, () => {
+            setTimeout(() => {
+                const months = node.getElementsByClassName('nivo_calendar_month');
+                expect(months).toNotBe(null);
+                expect(months.length).toBe(12 * 2);
+
+                done();
+            }, 400);
+        })
+    });
+
+    it('should render a label for each year', done => {
+        render((
+            <CalendarD3
+                width={700} height={400}
+                margin={{ top: 30, right: 30, bottom: 30, left: 30 }}
+                from={new Date(2013, 3, 1)} to={new Date(2014, 7, 12)}
+                transitionDuration={0}
+                transitionStaggering={0}
+            />
+        ), node, () => {
+            setTimeout(() => {
+                const legends = node.getElementsByClassName('nivo_calendar_year_legend');
+                expect(legends).toNotBe(null);
+                expect(legends.length).toBe(2);
+
+                done();
+            }, 400);
+        })
+    });
+
+    it('should support vertical layout', done => {
+        render((
+            <CalendarD3
+                width={400} height={700}
+                margin={{ top: 30, right: 30, bottom: 30, left: 30 }}
+                from={new Date(2013, 3, 1)} to={new Date(2014, 7, 12)}
+                direction="vertical"
+                transitionDuration={0}
+                transitionStaggering={0}
+            />
+        ), node, () => {
+            setTimeout(() => {
+                const days = node.getElementsByClassName('nivo_calendar_day');
+                expect(days).toNotBe(null);
+                expect(days.length).toBe(365 * 2);
+
+                done();
+            }, 400);
+        })
+    });
+});
diff --git a/src/components/charts/calendar/RepsonsiveCalendar.js b/src/components/charts/calendar/ResponsiveCalendar.js
similarity index 100%
rename from src/components/charts/calendar/RepsonsiveCalendar.js
rename to src/components/charts/calendar/ResponsiveCalendar.js