diff --git a/tests/Java.Interop-Tests/Java.Interop/JavaArrayContract.cs b/tests/Java.Interop-Tests/Java.Interop/JavaArrayContract.cs
index b3292642c..1279e2842 100644
--- a/tests/Java.Interop-Tests/Java.Interop/JavaArrayContract.cs
+++ b/tests/Java.Interop-Tests/Java.Interop/JavaArrayContract.cs
@@ -12,21 +12,13 @@ public abstract class JavaArrayContract<T> : ListContract<T>
 	{
 		int lrefStartCount;
 
-#if __ANDROID__
-		[TestFixtureSetUp]
-#else   // __ANDROID__
 		[OneTimeSetUp]
-#endif  // __ANDROID__
 		public void StartArrayTests ()
 		{
 			lrefStartCount  = JniEnvironment.LocalReferenceCount;
 		}
 
-#if __ANDROID__
-		[TestFixtureTearDown]
-#else   // __ANDROID__
 		[OneTimeTearDown]
-#endif  // __ANDROID__
 		public void EndArrayTests ()
 		{
 			int lref    = JniEnvironment.LocalReferenceCount;
diff --git a/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs b/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
index 896c1c9a6..f28fd7c02 100644
--- a/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
+++ b/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
@@ -158,11 +158,7 @@ public class JavaObjectArray_object_ContractTest : JavaObjectArrayContractTest<o
 
 		int grefStartCount;
 
-#if __ANDROID__
-		[TestFixtureSetUp]
-#else   // __ANDROID__
 		[OneTimeSetUp]
-#endif  // __ANDROID__
 		public void BeginCheckGlobalRefCount ()
 		{
 			// So that the JavaProxyObject.TypeRef GREF isn't counted.
@@ -171,11 +167,7 @@ public void BeginCheckGlobalRefCount ()
 			grefStartCount  = JniEnvironment.Runtime.GlobalReferenceCount;
 		}
 
-#if __ANDROID__
-		[TestFixtureTearDown]
-#else   // __ANDROID__
 		[OneTimeTearDown]
-#endif  // __ANDROID__
 		public void EndCheckGlobalRefCount ()
 		{
 			int gref    = JniEnvironment.Runtime.GlobalReferenceCount;
diff --git a/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs b/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs
index 1c47e12a3..ef0db0747 100644
--- a/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs
+++ b/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs
@@ -13,21 +13,13 @@ public class TestTypeTests : JavaVMFixture
 	{
 		int lrefStartCount;
 
-#if __ANDROID__
-		[TestFixtureSetUp]
-#else   // __ANDROID__
 		[OneTimeSetUp]
-#endif  // __ANDROID__
 		public void StartArrayTests ()
 		{
 			lrefStartCount  = JniEnvironment.LocalReferenceCount;
 		}
 
-#if __ANDROID__
-		[TestFixtureTearDown]
-#else   // __ANDROID__
 		[OneTimeTearDown]
-#endif  // __ANDROID__
 		public void EndArrayTests ()
 		{
 			int lref    = JniEnvironment.LocalReferenceCount;