diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb
index dd447d472..e938a9d79 100644
--- a/app/controllers/admin/invoices_controller.rb
+++ b/app/controllers/admin/invoices_controller.rb
@@ -2,7 +2,7 @@ class Admin::InvoicesController < AdminController
   load_and_authorize_resource
 
   def index
-    @q = Invoice.search(params[:q])
+    @q = Invoice.includes(:account_activity).search(params[:q])
     @q.sorts  = 'id desc' if @q.sorts.empty?
     @invoices = @q.result.page(params[:page])
   end
diff --git a/spec/fabricators/account_fabricator.rb b/spec/fabricators/account_fabricator.rb
index 2b9a3c273..496f8b900 100644
--- a/spec/fabricators/account_fabricator.rb
+++ b/spec/fabricators/account_fabricator.rb
@@ -2,5 +2,5 @@ Fabricator(:account) do
   account_type { Account::CASH }
   balance 0.0
   currency 'EUR'
-  account_activities(count: 2)
+  # account_activities(count: 2)
 end
diff --git a/spec/fabricators/invoice_fabricator.rb b/spec/fabricators/invoice_fabricator.rb
index daf2997bf..31d951cf1 100644
--- a/spec/fabricators/invoice_fabricator.rb
+++ b/spec/fabricators/invoice_fabricator.rb
@@ -9,4 +9,5 @@ Fabricator(:invoice) do
   seller_street { 'Paldiski mnt. 123' }
   invoice_items(count: 2)
   vat_prc 0.2
+  buyer { Fabricate(:registrar) }
 end
diff --git a/spec/features/admin/invoice_spec.rb b/spec/features/admin/invoice_spec.rb
new file mode 100644
index 000000000..f2a58d0a8
--- /dev/null
+++ b/spec/features/admin/invoice_spec.rb
@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+feature 'Invoice', type: :feature do
+  background { create_settings }
+
+  before :all do
+    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+    Fabricate(:invoice)
+  end
+
+  it 'should show index of invoices' do
+    sign_in @user
+    visit admin_invoices_url
+    i = Invoice.first
+    page.should have_link("Invoice no. #{i.id}")
+  end
+
+  it 'should show invoice' do
+    sign_in @user
+    visit admin_invoices_url
+    i = Invoice.first
+
+    click_link("Invoice no. #{i.id}")
+    page.should have_content("Seller")
+    page.should have_content("Details")
+    page.should have_content("Paldiski mnt. 123")
+  end
+end
diff --git a/spec/features/registrar/account_activity_spec.rb b/spec/features/registrar/account_activity_spec.rb
index 8c8ce105a..e2bc3be3a 100644
--- a/spec/features/registrar/account_activity_spec.rb
+++ b/spec/features/registrar/account_activity_spec.rb
@@ -3,6 +3,7 @@ require 'rails_helper'
 feature 'Account activity', type: :feature do
   before :all do
     @user = Fabricate(:api_user)
+    Fabricate(:account_activity, account: @user.registrar.cash_account)
   end
 
   context 'as unknown user' do
diff --git a/spec/features/registrar/invoices_spec.rb b/spec/features/registrar/invoices_spec.rb
index 5b777f50d..60758ae5d 100644
--- a/spec/features/registrar/invoices_spec.rb
+++ b/spec/features/registrar/invoices_spec.rb
@@ -4,6 +4,7 @@ feature 'Invoices', type: :feature do
   before :all do
     create_settings
     @user = Fabricate(:api_user)
+    Fabricate(:invoice)
   end
 
   context 'as unknown user' do