diff --git a/karma.conf.IntegrationTests.js b/karma.conf.js
similarity index 86%
rename from karma.conf.IntegrationTests.js
rename to karma.conf.js
index 6865f78..a90bbf1 100644
--- a/karma.conf.IntegrationTests.js
+++ b/karma.conf.js
@@ -10,14 +10,15 @@ module.exports = function(config) {
 
 		// list of files / patterns to load in the browser
 		files: [
-			{ pattern: './lib/jquery/jquery.js', watched: false },
-			{ pattern: './lib/jquery-ui/ui/jquery-ui.js', watched: false },
+			{ pattern: 'lib/jquery/jquery.js', watched: false },
+			{ pattern: 'lib/jquery-ui/ui/jquery-ui.js', watched: false },
 			{ pattern: 'lib/jquery-simulate/jquery.simulate.js', watched: false },
 			{ pattern: 'lib/jasmine-jquery/lib/jasmine-jquery.js', watched: false },
 			{ pattern: 'lib/jasmine-fixture/dist/jasmine-fixture.js', watched: false },
-			'./build/out/fullcalendar.js',
-			'./build/out/fullcalendar.css',
-			'./specs/fullCalendar*.js'
+			'build/out/fullcalendar.js',
+			'build/out/fullcalendar.css',
+			'tests/base.css',
+			'tests/automated/*.js'
 		],
 
 		// list of files to exclude
diff --git a/specs/fullCalendarSpecs-AgendaOptions-allDaySlots.js b/tests/automated/allDaySlot.js
similarity index 100%
rename from specs/fullCalendarSpecs-AgendaOptions-allDaySlots.js
rename to tests/automated/allDaySlot.js
diff --git a/specs/fullCalendarSpecs-AgendaOptions-allDayText.js b/tests/automated/allDayText.js
similarity index 100%
rename from specs/fullCalendarSpecs-AgendaOptions-allDayText.js
rename to tests/automated/allDayText.js
diff --git a/specs/fullCalendarSpecs-options-aspectRatio.js b/tests/automated/aspectRatio.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-aspectRatio.js
rename to tests/automated/aspectRatio.js
diff --git a/specs/fullCalendarSpecs-optionsCombinations-firstDay-isRTL.js b/tests/automated/complex-firstDay-isRTL.js
similarity index 100%
rename from specs/fullCalendarSpecs-optionsCombinations-firstDay-isRTL.js
rename to tests/automated/complex-firstDay-isRTL.js
diff --git a/specs/fullCalendarSpecs-options-headerDateClick.js b/tests/automated/complex-headerDateClick.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-headerDateClick.js
rename to tests/automated/complex-headerDateClick.js
diff --git a/specs/fullCalendarSpecs-optionsCombinations-weekNumbers-defaultView.js b/tests/automated/complex-weekNumbers-defaultView.js
similarity index 100%
rename from specs/fullCalendarSpecs-optionsCombinations-weekNumbers-defaultView.js
rename to tests/automated/complex-weekNumbers-defaultView.js
diff --git a/specs/fullCalendarSpecs-options-contentHeight.js b/tests/automated/contentHeight.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-contentHeight.js
rename to tests/automated/contentHeight.js
diff --git a/specs/fullCalendarSpecs-options-firstDay.js b/tests/automated/firstDay.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-firstDay.js
rename to tests/automated/firstDay.js
diff --git a/specs/fullCalendar.js b/tests/automated/fullCalendar.js
similarity index 100%
rename from specs/fullCalendar.js
rename to tests/automated/fullCalendar.js
diff --git a/specs/fullCalendarSpecs-options-handleWindowResize.js b/tests/automated/handleWindowResize.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-handleWindowResize.js
rename to tests/automated/handleWindowResize.js
diff --git a/specs/fullCalendarSpecs-options-header.js b/tests/automated/header.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-header.js
rename to tests/automated/header.js
diff --git a/specs/fullCalendarSpecs-options-height.js b/tests/automated/height.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-height.js
rename to tests/automated/height.js
diff --git a/specs/fullCalendarSpecs-options-hiddenDays.js b/tests/automated/hiddenDays.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-hiddenDays.js
rename to tests/automated/hiddenDays.js
diff --git a/specs/fullCalendarSpecs-options-isRTL.js b/tests/automated/isRTL.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-isRTL.js
rename to tests/automated/isRTL.js
diff --git a/specs/fullCalendarSpecs-AgendaOptions-minTime.js b/tests/automated/minTime.js
similarity index 100%
rename from specs/fullCalendarSpecs-AgendaOptions-minTime.js
rename to tests/automated/minTime.js
diff --git a/specs/fullCalendarSpecs-AgendaOptions-slotMinutes.js b/tests/automated/slotMinutes.js
similarity index 100%
rename from specs/fullCalendarSpecs-AgendaOptions-slotMinutes.js
rename to tests/automated/slotMinutes.js
diff --git a/specs/fullCalendarSpecs-options-weekMode.js b/tests/automated/weekMode.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-weekMode.js
rename to tests/automated/weekMode.js
diff --git a/specs/fullCalendarSpecs-options-weekNumberCalculation.js b/tests/automated/weekNumberCalculation.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-weekNumberCalculation.js
rename to tests/automated/weekNumberCalculation.js
diff --git a/specs/fullCalendarSpecs-options-weekNumbers.js b/tests/automated/weekNumbers.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-weekNumbers.js
rename to tests/automated/weekNumbers.js
diff --git a/specs/fullCalendarSpecs-options-weekends.js b/tests/automated/weekends.js
similarity index 100%
rename from specs/fullCalendarSpecs-options-weekends.js
rename to tests/automated/weekends.js