diff --git a/.functests b/.functests
index d4190f5675..65a9ea191c 100755
--- a/.functests
+++ b/.functests
@@ -4,12 +4,7 @@ SRC_DIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))")
 
 cd ${SRC_DIR}/test/functional
 nosetests --exe $@
-func1=$?
+rvalue=$?
 cd -
 
-cd ${SRC_DIR}/test/functionalnosetests
-nosetests --exe $@
-func2=$?
-cd -
-
-exit $((func1 + func2))
+exit $rvalue
diff --git a/test/functionalnosetests/swift_testing.py b/test/functional/swift_testing.py
similarity index 100%
rename from test/functionalnosetests/swift_testing.py
rename to test/functional/swift_testing.py
diff --git a/test/functionalnosetests/test_account.py b/test/functional/test_account.py
similarity index 100%
rename from test/functionalnosetests/test_account.py
rename to test/functional/test_account.py
diff --git a/test/functionalnosetests/test_container.py b/test/functional/test_container.py
similarity index 100%
rename from test/functionalnosetests/test_container.py
rename to test/functional/test_container.py
diff --git a/test/functionalnosetests/test_object.py b/test/functional/test_object.py
similarity index 100%
rename from test/functionalnosetests/test_object.py
rename to test/functional/test_object.py
diff --git a/test/functionalnosetests/__init__.py b/test/functionalnosetests/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000