diff --git a/tests/integration/system/env_spec.rb b/tests/integration/system/env_spec.rb
new file mode 100644
index 0000000..2f5c689
--- /dev/null
+++ b/tests/integration/system/env_spec.rb
@@ -0,0 +1,12 @@
+
+## PROXIES
+#
+describe file('/etc/environment') do
+    it('should exist')
+    its('content') { should_not match /HTTPS_PROXY"/ }
+    its('content') { should match /HTTP_PROXY="http:\/\/127.0.4.2:80"/ }
+    its('content') { should match /BOB_PATH=/}
+    its('content') { should match /LC_ALL="C"/ }
+    its('content') { should match /ftp_proxy=.*127.0.4.3:2121/ }
+    its('content') { should match /NO_PROXY=.*dummy.net,.local/ }
+end
diff --git a/tests/integration/system/profile_spec.rb b/tests/integration/system/profile_spec.rb
new file mode 100644
index 0000000..d51c11e
--- /dev/null
+++ b/tests/integration/system/profile_spec.rb
@@ -0,0 +1,17 @@
+
+describe file('/etc/profile.d/salt_profile_vi_flavors.sh') do
+    it('should exist')
+    its('content') { should match /EDITOR=vim/ }
+    its('content') { should match /PAGER=view/ }
+    its('content') { should match /alias vi=vim/ }
+end
+
+describe file('/etc/profile.d/salt_profile_locales.sh') do
+    it('should exist')
+    its('content') { should match /LANG=en_US/ }
+end
+
+describe file('/etc/profile.d/prompt.sh') do
+    it('should exist')
+end
+
diff --git a/tests/integration/system/repo_spec.rb b/tests/integration/system/repo_spec.rb
new file mode 100644
index 0000000..91b4b9b
--- /dev/null
+++ b/tests/integration/system/repo_spec.rb
@@ -0,0 +1,17 @@
+
+# PROXIES
+#
+# globally
+describe file('/etc/apt/apt.conf.d/99proxies-salt') do
+    it('should exist')
+    its('content') { should_not match /ftp/ }
+    its('content') { should match /proxy "https.*127.0.2.1:4443"/ }
+end
+
+# per repo
+describe file('/etc/apt/apt.conf.d/99proxies-salt-opencontrail') do
+    it('should exist')
+    its('content') { should_not match /ftp/ }
+    its('content') { should match /Acquire::https::proxy::ppa.launchpad.net/ }
+end
+