diff --git a/db/migrate/20190811202711_change_invoices_required_columns_to_not_null.rb b/db/migrate/20190811202711_change_invoices_required_columns_to_not_null.rb
new file mode 100644
index 000000000..fc8f0f895
--- /dev/null
+++ b/db/migrate/20190811202711_change_invoices_required_columns_to_not_null.rb
@@ -0,0 +1,15 @@
+class ChangeInvoicesRequiredColumnsToNotNull < ActiveRecord::Migration
+  def change
+    change_column_null :invoices, :buyer_id, false
+    change_column_null :invoices, :seller_reg_no, false
+    change_column_null :invoices, :seller_bank, false
+    change_column_null :invoices, :seller_swift, false
+    change_column_null :invoices, :seller_country_code, false
+    change_column_null :invoices, :seller_street, false
+    change_column_null :invoices, :seller_city, false
+    change_column_null :invoices, :buyer_reg_no, false
+    change_column_null :invoices, :buyer_country_code, false
+    change_column_null :invoices, :buyer_street, false
+    change_column_null :invoices, :buyer_city, false
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 0e122c441..ccc253007 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -936,27 +936,27 @@ CREATE TABLE public.invoices (
     reference_no character varying NOT NULL,
     vat_rate numeric(4,3) NOT NULL,
     seller_name character varying NOT NULL,
-    seller_reg_no character varying,
+    seller_reg_no character varying NOT NULL,
     seller_iban character varying NOT NULL,
-    seller_bank character varying,
-    seller_swift character varying,
+    seller_bank character varying NOT NULL,
+    seller_swift character varying NOT NULL,
     seller_vat_no character varying,
-    seller_country_code character varying,
+    seller_country_code character varying NOT NULL,
     seller_state character varying,
-    seller_street character varying,
-    seller_city character varying,
+    seller_street character varying NOT NULL,
+    seller_city character varying NOT NULL,
     seller_zip character varying,
     seller_phone character varying,
     seller_url character varying,
     seller_email character varying,
     seller_contact_name character varying,
-    buyer_id integer,
+    buyer_id integer NOT NULL,
     buyer_name character varying NOT NULL,
-    buyer_reg_no character varying,
-    buyer_country_code character varying,
+    buyer_reg_no character varying NOT NULL,
+    buyer_country_code character varying NOT NULL,
     buyer_state character varying,
-    buyer_street character varying,
-    buyer_city character varying,
+    buyer_street character varying NOT NULL,
+    buyer_city character varying NOT NULL,
     buyer_zip character varying,
     buyer_phone character varying,
     buyer_url character varying,
@@ -4833,3 +4833,5 @@ INSERT INTO schema_migrations (version) VALUES ('20190811202042');
 
 INSERT INTO schema_migrations (version) VALUES ('20190811202347');
 
+INSERT INTO schema_migrations (version) VALUES ('20190811202711');
+
diff --git a/test/fixtures/invoices.yml b/test/fixtures/invoices.yml
index c3e3bac79..7c6be1afd 100644
--- a/test/fixtures/invoices.yml
+++ b/test/fixtures/invoices.yml
@@ -3,9 +3,19 @@ one:
   due_date: <%= Date.parse '2010-07-06' %>
   currency: EUR
   seller_name: Seller Ltd
-  seller_iban: US75512108001245126199
+  seller_reg_no: 1234
+  seller_iban: iban
+  seller_bank: Main Bank
+  seller_swift: swift
+  seller_country_code: US
+  seller_street: Main Street 1
+  seller_city: New York
   buyer: bestnames
   buyer_name: Buyer Ltd
+  buyer_reg_no: 12345
+  buyer_country_code: GB
+  buyer_street: Main Street 2
+  buyer_city: London
   vat_rate: 0.1
   total: 16.50
   reference_no: 13