diff --git a/integration-test/clean b/integration-test/clean
index 7b306a1e..7ee79c82 100755
--- a/integration-test/clean
+++ b/integration-test/clean
@@ -2,8 +2,6 @@
 # Clean/remove setup
 
 rm -r node_modules
-rm uport.js
-rm karma.conf.js
-rm testData.json
+rm uportWeb3.js Connect.js karma.conf.js testData.json
 rm ../uport-connect-0.0.0-semantic-release.tgz
 rm -r coverage
diff --git a/integration-test/setup b/integration-test/setup
index 35ca259f..ef98629f 100755
--- a/integration-test/setup
+++ b/integration-test/setup
@@ -2,9 +2,7 @@
 # Script to setup tests against the npm package (not only the files)
 
 cd ..
-cp ./test/uport.js integration-test/
-cp ./test/karma.conf.js integration-test/
-cp ./test/testData.json integration-test/
+cp ./test/uportWeb3.js ./test/Connect.js ./test/karma.conf.js ./test/testData.json integration-test/
 npm pack
 cd integration-test
 npm install
diff --git a/integration-test/uport-config.js b/integration-test/uport-connect.js
similarity index 100%
rename from integration-test/uport-config.js
rename to integration-test/uport-connect.js
diff --git a/test/Connect.js b/test/Connect.js
index d2a23166..164cb109 100644
--- a/test/Connect.js
+++ b/test/Connect.js
@@ -1,5 +1,5 @@
 import { expect, assert } from 'chai'
-import Connect from '../src/Connect'
+import { Connect } from './uport-connect'
 // import { Credentials, SimpleSigner } from 'uport'
 import { openQr, closeQr } from '../src/util/qrdisplay'
 // import MockDate from 'mockdate'
@@ -158,7 +158,7 @@ describe('Connect', ()=> {
       uport.request({
         uri,
         topic: mockTopic(),
-        uriHandler: (_uri) => { 
+        uriHandler: (_uri) => {
           assert.fail()
           done()
         }
@@ -188,7 +188,7 @@ describe('Connect', ()=> {
       }, error => {
         expect(error.message).to.equal('It broke')
         expect(opened).to.equal(true)
-        expect(closed).to.equal(true)        
+        expect(closed).to.equal(true)
         done()
       })
     })
@@ -216,7 +216,7 @@ describe('Connect', ()=> {
         expect(profile).to.equal(PROFILE)
         done()
       }, error => {
-        console.err(error)        
+        console.err(error)
         done()
       })
     })
@@ -243,7 +243,7 @@ describe('Connect', ()=> {
         expect(address).to.equal(UPORT_ID)
         done()
       }, error => {
-        console.err(error)        
+        console.err(error)
         done()
       })
     })
diff --git a/test/uport-connect.js b/test/uport-connect.js
new file mode 100644
index 00000000..ff05ed76
--- /dev/null
+++ b/test/uport-connect.js
@@ -0,0 +1,2 @@
+import { Connect, QRUtil, SimpleSigner, Credentials } from '../src/index'
+export { Connect, QRUtil, SimpleSigner, Credentials }
diff --git a/test/uportWeb3.js b/test/uportWeb3.js
index 20dd3c9c..18628675 100644
--- a/test/uportWeb3.js
+++ b/test/uportWeb3.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai'
 import Web3 from 'web3'
-import Connect from '../src/Connect'
+import { Connect } from './uport-connect'
 import Autosigner from '../utils/autosigner'
 import testData from './testData.json'