diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/transaction/usertransaction/UserTransactionAccessTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/transaction/usertransaction/UserTransactionAccessTestCase.java
index 285ac0c1dd39..de7ca0efd3f3 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/transaction/usertransaction/UserTransactionAccessTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/transaction/usertransaction/UserTransactionAccessTestCase.java
@@ -25,13 +25,11 @@
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.naming.InitialContext;
-import java.io.File;
/**
* @author Jaikiran Pai
@@ -46,7 +44,6 @@ public class UserTransactionAccessTestCase {
public static JavaArchive createDeployment() {
final JavaArchive jar = ShrinkWrap.create(JavaArchive.class, MODULE_NAME + ".jar");
jar.addPackage(UserTransactionAccessTestCase.class.getPackage());
- jar.as(ZipExporter.class).exportTo(new File(".", jar.getName()), true);
return jar;
}
diff --git a/testsuite/integration/elytron/src/test/resources/logging.properties b/testsuite/integration/elytron/src/test/resources/logging.properties
index afe33263cd45..9e603460d3a8 100644
--- a/testsuite/integration/elytron/src/test/resources/logging.properties
+++ b/testsuite/integration/elytron/src/test/resources/logging.properties
@@ -51,7 +51,7 @@ handler.FILE.properties=autoFlush,append,fileName,suffix
handler.FILE.constructorProperties=fileName,append
handler.FILE.autoFlush=true
handler.FILE.append=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
+handler.FILE.fileName=${org.jboss.boot.log.file:target/boot.log}
handler.FILE.suffix=.yyyy-MM-dd
formatter.COLOR-PATTERN=org.jboss.logmanager.formatters.PatternFormatter
diff --git a/testsuite/integration/iiop/pom.xml b/testsuite/integration/iiop/pom.xml
index 5fc8ccf31cf7..72859268b4a0 100644
--- a/testsuite/integration/iiop/pom.xml
+++ b/testsuite/integration/iiop/pom.xml
@@ -26,8 +26,7 @@
${jbossas.ts.dir}/..
-Djava.endorsed.dirs=${project.build.directory}/endorsed
ssl-enable-elytron.cli
- jbossas
- ${basedir}/target/${jbossas}/standalone/configuration
+ ${basedir}/target/wildfly/standalone/configuration
@@ -118,6 +117,7 @@
-Dcom.sun.CORBA.ORBUseDynamicStub=true
-Dcom.arjuna.ats.arjuna.common.propertiesFile=jbossts-properties.xml ${surefire.jacoco.args}
+ ${basedir}/target
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WSTrustTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WSTrustTestCase.java
index 2fe195681353..018a1d29a5f8 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WSTrustTestCase.java
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WSTrustTestCase.java
@@ -39,6 +39,7 @@
import org.jboss.as.test.integration.ws.wsse.trust.holderofkey.HolderOfKeyIface;
import org.jboss.as.test.integration.ws.wsse.trust.onbehalfof.OnBehalfOfServiceIface;
import org.jboss.as.test.integration.ws.wsse.trust.service.ServiceIface;
+import org.jboss.as.test.shared.TestSuiteEnvironment;
import org.jboss.dmr.ModelNode;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset;
@@ -268,7 +269,7 @@ private String getClientJarPaths() throws IOException {
jar.addManifest()
.addAsManifestResource(WSTrustTestCase.class.getPackage(), "META-INF/clientKeystore.properties", "clientKeystore.properties")
.addAsManifestResource(WSTrustTestCase.class.getPackage(), "META-INF/clientstore.jks", "clientstore.jks");
- File jarFile = new File("jaxws-samples-wsse-policy-trust-client.jar");
+ File jarFile = new File(TestSuiteEnvironment.getTmpDir(), "jaxws-samples-wsse-policy-trust-client.jar");
jar.as(ZipExporter.class).exportTo(jarFile, true);
return jarFile.getAbsolutePath();
}