diff --git a/tests/automated/columnFormat.js b/tests/automated/columnFormat.js
new file mode 100644
index 0000000..af4c017
--- /dev/null
+++ b/tests/automated/columnFormat.js
@@ -0,0 +1,90 @@
+describe('columnFormat', function() {
+
+    beforeEach(function() {
+        affix('#cal');
+    });
+
+    describe('when columnFormat is not set', function() {
+
+        var viewWithFormat = [ { view: 'month', expected: 'Sun', selector: 'th.fc-day-header.fc-sun' },
+            { view: 'basicWeek', expected: 'Sun 5/11', selector: 'th.fc-day-header.fc-sun' },
+            { view: 'agendaWeek', expected: 'Sun 5/11', selector: 'th.fc-widget-header.fc-sun' },
+            { view: 'basicDay', expected: 'Sunday', selector: 'th.fc-day-header.fc-sun' },
+            { view: 'agendaDay', expected: 'Sunday', selector: 'th.fc-widget-header.fc-sun' } ];
+
+        beforeEach(function() {
+            $('#cal').fullCalendar({
+                defaultDate: '2014-05-11'
+            });
+        });
+
+        it('should have default values', function() {
+            var cal = $('#cal');
+
+            for (var i = 0; i <  viewWithFormat.length; i++) {
+                var crtView = viewWithFormat[i];
+                cal.fullCalendar('changeView', crtView.view);
+                expect(cal.find(crtView.selector).text()).toBe(crtView.expected);
+            };
+        });
+    });
+
+    describe('when columnFormat is set on a per-view basis', function() {
+
+        var viewWithFormat = [ { view: 'month', expected: 'Sunday', selector: 'th.fc-day-header.fc-sun' },
+            { view: 'basicWeek', expected: 'Sunday 11 - 5', selector: 'th.fc-day-header.fc-sun' },
+            { view: 'agendaWeek', expected: 'Sunday 11 , 5', selector: 'th.fc-widget-header.fc-sun' },
+            { view: 'basicDay', expected: 'Sunday 11 | 5', selector: 'th.fc-day-header.fc-sun' },
+            { view: 'agendaDay', expected: 'Sunday 5/11', selector: 'th.fc-widget-header.fc-sun' } ];
+
+        beforeEach(function() {
+            $('#cal').fullCalendar({
+                defaultDate: '2014-05-11',
+                columnFormat: {
+                    month: 'dddd',
+                    agendaDay: 'dddd M/D',
+                    agendaWeek: 'dddd D , M',
+                    basicDay: 'dddd D | M',
+                    basicWeek: 'dddd D - M',
+                }
+            });
+        });
+
+        it('should have the correct values', function() {
+            var cal = $('#cal');
+
+            for (var i = 0; i <  viewWithFormat.length; i++) {
+                var crtView = viewWithFormat[i];
+                cal.fullCalendar('changeView', crtView.view);
+                expect(cal.find(crtView.selector).text()).toBe(crtView.expected);
+            };
+        });
+    });
+
+
+    describe('when lang is Fr', function() {
+
+        var viewWithFormat = [ { view: 'month', expected: 'dim.', selector: 'th.fc-day-header.fc-sun' },
+            { view: 'basicWeek', expected: 'dim. 11/05', selector: 'th.fc-day-header.fc-sun' },
+            { view: 'agendaWeek', expected: 'dim. 11/05', selector: 'th.fc-widget-header.fc-sun' },
+            { view: 'basicDay', expected: 'dimanche', selector: 'th.fc-day-header.fc-sun' },
+            { view: 'agendaDay', expected: 'dimanche', selector: 'th.fc-widget-header.fc-sun' } ];
+
+        beforeEach(function() {
+            $('#cal').fullCalendar({
+                defaultDate: '2014-05-11',
+                lang: 'fr'
+            });
+        });
+
+        it('should have the translated dates', function() {
+            var cal = $('#cal');
+
+            for (var i = 0; i <  viewWithFormat.length; i++) {
+                var crtView = viewWithFormat[i];
+                cal.fullCalendar('changeView', crtView.view);
+                expect(cal.find(crtView.selector).text()).toBe(crtView.expected);
+            };
+        });
+    });
+});