diff --git a/app/views/conference/schedule.xml.haml b/app/views/conference/schedule.xml.haml
index 94fd9f4f..32083649 100644
--- a/app/views/conference/schedule.xml.haml
+++ b/app/views/conference/schedule.xml.haml
@@ -12,7 +12,7 @@
     - @events_xml.keys.each.with_index(1) do |day, index|
       %day{ date: day, index: index }
         - events_in_rooms = @events_xml[day].group_by(&:room)
-        - @rooms.each do |room|
+        - events_in_rooms.keys.each do |room|
           %room{ name: room.name }
             - events_in_rooms[room].each do |event|
               %event{ guid: event.guid, id: event.id }
@@ -21,7 +21,7 @@
                 %duration= length_timestamp(event.event_type.length)
                 %room= event.room.name
                 %type= event.event_type.name
-                %language= 'en' #FIXME
+                %language= ISO_639.find_by_english_name(event.language).third if event.language
                 %slug= "#{event.id} #{event.title}".parameterize
                 %title= event.title
                 %subtitle= event.subtitle
diff --git a/spec/controllers/conference_controller_spec.rb b/spec/controllers/conference_controller_spec.rb
index 2b60b544..995cab08 100644
--- a/spec/controllers/conference_controller_spec.rb
+++ b/spec/controllers/conference_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ConferenceController do
-  let(:conference) { create(:conference,  splashpage: create(:splashpage, public: true)) }
+  let(:conference) { create(:full_conference,  splashpage: create(:splashpage, public: true)) }
 
   describe 'GET #index' do
     it 'Response code is 200' do
@@ -24,6 +24,29 @@ describe ConferenceController do
     end
   end
 
+  describe 'GET #schedule' do
+    context 'XML' do
+      before :each do
+        conference.program.schedule_public = true
+        conference.program.save!
+        create(:event_scheduled, program: conference.program)
+        create(:event_scheduled, program: conference.program)
+
+        get :schedule, id: conference.short_title, format: :xml
+      end
+
+      it 'assigns variables' do
+        expect(assigns(:conference)).to eq conference
+        expect(assigns(:events_xml)).to eq conference.program.events.scheduled.
+                                           group_by{ |event| event.start_time.to_date }
+      end
+
+      it 'renders successfully' do
+        expect(response).to be_success
+      end
+    end
+  end
+
   describe 'OPTIONS #index' do
     it 'Response code is 200' do
       process :index, 'OPTIONS'
diff --git a/spec/factories/events.rb b/spec/factories/events.rb
index 8cbf2293..6d8dc2b1 100644
--- a/spec/factories/events.rb
+++ b/spec/factories/events.rb
@@ -29,6 +29,13 @@ FactoryGirl.define do
         event.room = build(:room, venue: venue)
         event.comment_threads << build(:comment, commentable: event)
       end
+
+      factory :event_scheduled do
+        after(:build) do |event|
+          event.state = 'confirmed'
+          event.start_time = event.program.conference.start_date.to_time
+        end
+      end
     end
   end
 end